feat：处理合并代码冲突

fs-service/src/main/java/com/fs/course/param/FsCourseWatchLogListParam.java

@@ -58,7 +58,7 @@ public class FsCourseWatchLogListParam implements Serializable {
 
 
     private Long taskId;//任务ID
-    private Long project;//任务ID
+//    private Long project;//任务ID
 
     private String customPageStr;
 

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

@@ -1,7 +1,6 @@
 package com.fs.hisStore.mapper;
 
 import java.util.List;
-import java.util.Map;
 
 import com.fs.his.param.FsStoreProductListSParam;
 import com.fs.his.vo.FsStoreProductListSVO;
@@ -181,9 +180,7 @@ public interface FsStoreProductScrmMapper
     @Select({"<script> " +
             "select p.* from fs_store_product_scrm p  " +
             //新增审核状态及所属店铺审核状态
-            "<if test = 'maps.isStores != null and maps.isStores == 1   '>"+
             "inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +
-            "</if>" +
             "where p.is_del=0 and p.is_show=1  and p.is_audit = '1'" +
             "<if test = 'maps.productName != null and  maps.productName !=\"\"    '> " +
             "and (p.product_name like CONCAT('%',#{maps.productName},'%')  or p.keyword like concat('%',#{maps.productName},'%') ) " +
@@ -273,11 +270,6 @@ public interface FsStoreProductScrmMapper
     List<FsStoreProductListQueryVO> selectFsStoreProductHotQuery(@Param("count") int count,@Param("config") MedicalMallConfig  config);
     @Select({"<script> " +
             "select p.* from fs_store_product_scrm p " +
-
-    List<FsStoreProductListQueryVO> selectFsStoreProductNewQuery(Map<String, Object> params);
-
-    List<FsStoreProductListQueryVO> selectFsStoreProductHotQuery(Map<String, Object> params);
-    @Select("select p.* from fs_store_product_scrm p " +
             //新增审核状态及所属店铺审核状态
             "<if test='config.isAudit == \"1\" '>" +
             " inner join fs_store_scrm fs on fs.store_id = p.store_id and fs.is_audit = 1 " +

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductScrmServiceImpl.java

@@ -722,7 +722,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", count);
         map.put("config", medicalMallConfig);
-        return fsStoreProductMapper.selectFsStoreProductNewQuery(map);
+        return fsStoreProductMapper.selectFsStoreProductNewQuery(count, medicalMallConfig);
     }
 
     @Override
@@ -730,7 +730,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", count);
         map.put("config", medicalMallConfig);
-        return fsStoreProductMapper.selectFsStoreProductHotQuery(map);
+        return fsStoreProductMapper.selectFsStoreProductHotQuery(count, medicalMallConfig);
     }
 
     @Override