调整方法冲突问题

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderMapper.java

@@ -1037,7 +1037,7 @@ public interface FsStoreOrderMapper
 
     List<Report> selectOrderByCustomerIds(@Param("map") ReportParam param);
 
-    int selectFsStoreOrderCount(FsStoreOrderStatisticsParam param);
+    int selectFsStoreOrderByCount(FsStoreOrderStatisticsParam param);
 
     BigDecimal selectFsStoreOrderByPayPriceCount(FsStoreOrderStatisticsParam param);
 

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

@@ -142,7 +142,7 @@ public class FsStoreProductAddEditParam implements Serializable
     private List<ProductArrtDTO> items;
     //sku结果集
     private List<FsStoreProductAttrValue> values;
-    // 指定企业
+        // 指定企业
     private String companyIds;
 
 }

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -2191,7 +2191,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
 
     @Override
     public Integer selectFsStoreOrderCount(FsStoreOrderStatisticsParam param) {
-        return fsStoreOrderMapper.selectFsStoreOrderCount(param);
+        return fsStoreOrderMapper.selectFsStoreOrderByCount(param);
     }
 
     @Override

fs-service-system/src/main/resources/application-config-dev.yml

@@ -64,11 +64,11 @@ wx:
         aesKey: PKvaxtpSv8NGpfTDm7VUHIK8Wok2ESyYX24qpXJAdMP
   miniapp:
     configs:
-      - appid: wx11a2ce7c2bbc4521   #倍力优会员商城
-        secret: d680dc8ff20258b158c9355f8b7769ae
-        token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
-        aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
-        msgDataFormat: JSON
+#      - appid: wx11a2ce7c2bbc4521   #倍力优会员商城
+#        secret: d680dc8ff20258b158c9355f8b7769ae
+#        token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
+#        aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
+#        msgDataFormat: JSON
 
 ##  云联融智优选小程序，暂时使用
       - appid: wxd70f99287830cb51   #云联融智优选（暂时用于测试销售app）

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

@@ -509,7 +509,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectFsStoreOrderCount" resultType="int">
+    <select id="selectFsStoreOrderByCount" resultType="int">
         select  count(id) from fs_store_order
         <where>
             <if test="startTime != null and startTime != ''">AND date_format(create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')</if>