Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

lty

15 小时以前 4bb523147bc6e9fef20142d1389c893f97321e02

 src/main/java/com/zy/common/model/LocTypeDto.java

@@ -36,6 +36,7 @@
        } else {
            this.locType1 = 2; // 高库位
        }
        this.locType1 = 1; // 低库位
        log.info(JSON.toJSONString(this));
    }