Merge remote-tracking branch 'origin/master'

src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml

@@ -161,6 +161,12 @@
           #{item}
         </foreach>
       </if>
+      <if test="param.idCards != null">
+        AND a.id_card IN
+        <foreach collection="param.idCards" item="item" separator="," open="(" close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="param.province != null">
         AND a.province LIKE CONCAT('%', #{param.province}, '%')
       </if>

src/main/java/com/gxwebsoft/common/system/param/UserParam.java

@@ -247,6 +247,10 @@ public class UserParam extends BaseParam {
     @TableField(exist = false)
     private Set<String> phones;
 
+    @ApiModelProperty("用户身份证集合")
+    @TableField(exist = false)
+    private Set<String> idCards;
+
     @ApiModelProperty("是否查询用户详细资料表")
     @TableField(exist = false)
     private Boolean showProfile;