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

lsh

2 天以前 3041eb1b0b76b75b916939e77c7ae97a80fe5af3

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