Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-07-06 96a3439306a4e7e3743f0d1c4b6253690f7fdf6c

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