Merge branch 'master' into master-test

wangrenhuang

2023-06-25 b4707c89691166e9febc0e3321c0ecea6d5c30f3

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

@@ -21,6 +21,8 @@
    private String labelInfoNo;
    /**标签名称*/
    private String labelInfoName;
    /**颜色*/
    private String color;

    public AppearanceLabelDto() {
    }