修复bug

fs-service/src/main/java/com/fs/company/domain/CompanyWxDialog.java

@@ -29,5 +29,8 @@ public class CompanyWxDialog extends BaseEntityTow {
     @Excel(name = "模板")
     private String templateDetails;
 
+    private String createUser;
+
+
 
 }

fs-service/src/main/java/com/fs/course/domain/FsUserCourse.java

@@ -1,6 +1,7 @@
 package com.fs.course.domain;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fs.common.annotation.Excel;
@@ -157,4 +158,10 @@ public class FsUserCourse extends BaseEntity
      */
     private String configJson;
 
+    //多个课堂名称搜索
+    private List<String> courseNames;
+
+    //任务ID
+    private Long taskId;
+
 }

fs-service/src/main/java/com/fs/crm/vo/CrmCustomerListVO.java

@@ -114,6 +114,8 @@ public class CrmCustomerListVO implements Serializable
 
     private String companyUserNickName;
 
+    private String remark;
+
     /** 认领开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreCouponIssueScrmMapper.java

@@ -121,11 +121,11 @@ public interface FsStoreCouponIssueScrmMapper
             "<if test = 'maps.couponName != null and  maps.couponName !=\"\"     '> " +
             "and i.coupon_name like CONCAT('%',#{maps.couponName},'%') " +
             "</if>" +
-            "<if test = 'maps.beginTime != null and maps.beginTime != \"\" '> " +
-            "and date_format(i.create_time,'%y%m%d') &gt;= date_format(#{maps.beginTime},'%y%m%d') " +
+            "<if test = 'maps.params.beginTime != null and maps.params.beginTime != \"\" '> " +
+            "and date_format(i.create_time,'%y%m%d') &gt;= date_format(#{maps.params.beginTime},'%y%m%d') " +
             "</if>" +
-            "<if test = 'maps.endTime != null and maps.endTime != \"\" '> " +
-            "and date_format(i.create_time,'%y%m%d') &lt;= date_format(#{maps.endTime},'%y%m%d') " +
+            "<if test = 'maps.params.endTime != null and maps.params.endTime != \"\" '> " +
+            "and date_format(i.create_time,'%y%m%d') &lt;= date_format(#{maps.params.endTime},'%y%m%d') " +
             "</if>" +
             " order by c.coupon_price "+
             "</script>"})

fs-service/src/main/resources/mapper/course/FsUserCourseCategoryMapper.xml

@@ -30,6 +30,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
         </where>
+
+        ORDER BY pid ASC, sort ASC
     </select>
 
     <select id="selectFsUserCourseCategoryByCateId" parameterType="Long" resultMap="FsUserCourseCategoryResult">