Merge branch 'master-stander' into master-jiayan

fwq

10 小时以前 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061

 phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java

@@ -23,6 +23,8 @@
    private String labelInfoName;
    /**颜色*/
    private String color;
    /** 其他信息 */
    private AppearanceLabelInfoDto labelInfo;

    public AppearanceLabelDto() {
    }