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

1

3 天以前 d5eb955933d4c7dc1f102d8a688f7447b5a674fd

 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));
    }