Merge branch 'master' into master-test

wangrenhuang

2023-09-25 195af7b92b0aa5534cb28d25aa589f2d2545c7e9

 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() {
    }