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

zhangc

7 天以前 84e12ecd3923f28b62b8659b138a554b0f6e084d

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