Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-14 8c51032933d201b0c7aedbde0af6e5ff52db329d

 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;