Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

 phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java

@@ -21,17 +21,14 @@
    /**标签名称*/
    private String tagName;

    /**标签类型编号*/
    private String tagTypeNo;

    /**标签类别*/
    private String tagTypeName;

    /**用户平台编号*/
    private String platformCode;

    /**标签标识匹配搜索*/
    private List<String> tagNoAndList;

    /**标签标识包含搜索*/
    private List<String> tagNoOrList;

    /**标签名称匹配搜索*/
    private List<String> tagNameAndList;