Merge branch 'master-prod-new' into fhx-prod-订单升单

fhx

2023-08-24 e09e3c40e9acf5bac969c829a942d6c1e532a895

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