Merge branch 'fhx-prod-CRM预约' into master-test

fhx

2024-04-08 dc694f1781a35e24436a78ed475cf2f839c78a3d

 phis-feign/src/main/java/com/hz/his/dto/label/UserLabelEditDto.java

@@ -9,7 +9,7 @@
@Data
public class UserLabelEditDto {

    /**标识父标识*/
    /**是否自定义*/
    private Integer isCustom;
    /**标签类型编号*/
    private String typeNo;