Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new-...

fwq

2023-03-21 04aaeba45a2b178caa748284b4e0942cee7fcfcc

 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;