Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

3 天以前 70930071a49190f414c8d8bc9c9e9795a4096739

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