管理端会员查询-添加搜索条件

fs-service-system/src/main/java/com/fs/store/param/h5/FsUserPageListParam.java

@@ -1,6 +1,7 @@
 package com.fs.store.param.h5;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -29,9 +30,11 @@ public class FsUserPageListParam implements Serializable {
     private String companyUserId;
 
     @ApiModelProperty(value = "注册时间-开始")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String registerStartTime;
 
     @ApiModelProperty(value = "注册时间-结束")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String registerEndTime;
 
     @ApiModelProperty(value = "标签")

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -466,7 +466,12 @@
                 </when>
             </choose>
         </if>
-
+        <if test="nickname != null and nickname !='' ">
+            AND nickname LIKE concat('%"',#{nickname},'"%')
+        </if>
+        <if test="phone != null and phone !='' ">
+            AND phone LIKE concat('%"',#{phone},'"%')
+        </if>
         group by fs_user.user_id
 
         <if test="continueMissCourseSort != null and continueMissCourseSort !='' ">