Merge branch 'master' into master-test

wangrenhuang

2023-05-22 a4d937e5e739d50b304a144da4c3317146b055d9

 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;