Merge branch 'rcs_master' into ctu_conveyor

zhang

7 天以前 39efc87b3794f957aad73acf3a430b84e3a19b27

 zy-acs-common/src/main/java/com/zy/acs/common/domain/HeightDepthDto.java

@@ -19,6 +19,10 @@
    public HeightDepthDto() {
    }

    public HeightDepthDto(Number height) {
        this.height = toShort(height);
    }

    public HeightDepthDto(Number height, Number depth) {
        this.height = toShort(height);
        this.depth  = toShort(depth);