Merge remote-tracking branch 'origin/master'

修改同步错误
1 changed files with 1 additions and 1 deletions
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsReturnOrderVo.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsReturnOrderVo.java
@ -152,7 +152,7 @@ public class WmsReturnOrderVo implements Serializable {
    private String warehouseCode;//字段映射

    private String materialCode;
-    private String materialName;
+
    private String materialUnit;

    /**
Author	SHA1	Message	Date
wanghao	5d883a1512	Merge remote-tracking branch 'origin/master'	1 day ago
wanghao	85534e2107	修改同步错误	1 day ago