Merge remote-tracking branch 'remotes/origin/dev' into test

6 years ago · 0589b5e79a
parent e61669dd98 07c227769d
commit 0589b5e79a
1 changed files with 1 additions and 1 deletions
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
@ -56,7 +56,7 @@ public class WmsLocatePart extends BaseBean{
    @ApiParam(value = "是否生成领料单", example = "2")
    private Integer isGeneratePicklist;

-    public Double  getMix() {
+    public Double  getMin() {
        return this.min == null ? 0 : this.min;
    }