Merge branch 'master-xlk' into master-xlk-test

fhx

2024-08-23 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0

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

@@ -21,6 +21,10 @@
    private String labelInfoNo;
    /**标签名称*/
    private String labelInfoName;
    /**颜色*/
    private String color;
    /** 其他信息 */
    private AppearanceLabelInfoDto labelInfo;

    public AppearanceLabelDto() {
    }