Merge remote-tracking branch 'origin/master'

wangrenhuang

2022-08-09 1e54931e0a5f12f5c1125b30abfef378c050bd4d

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

@@ -33,10 +33,10 @@
    /**标签标识包含搜索*/
    private List<String> tagNoOrList;

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

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

    public UserTagInfoDto() {