Merge remote-tracking branch 'origin/master-test' into master-test

wangrenhuang

2023-02-16 a3a2fe8909a84e177f3f8d183987eff4e391ea7b

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

@@ -27,16 +27,10 @@
    /**用户平台编号*/
    private String platformCode;

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

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

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

    /**标签标识包含搜索*/
    /**标签名称包含搜索*/
    private List<String> tagNameOrList;

    public UserTagInfoDto() {