Merge remote-tracking branch 'origin/master'

# Conflicts:
#	fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderMapper.java
#	fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java
#	fs-service-system/src/main/resources/mapper/store/FsStoreOrderMapper.xml

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 selectFsStoreOrderByCount(FsStoreOrderStatisticsParam param);
+    int selectFsStoreOrderCountByParam(FsStoreOrderStatisticsParam param);
 
     BigDecimal selectFsStoreOrderByPayPriceCount(FsStoreOrderStatisticsParam param);
 

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

@@ -85,6 +85,6 @@ public class FsStoreOrderParam extends BaseEntity implements Serializable
     /**
      * 支付状态 待支付 1已支付
      */
-    private int paidStatus;
+    private Integer paidStatus;
 
 }

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

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

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

@@ -513,7 +513,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectFsStoreOrderByCount" resultType="int">
+    <select id="selectFsStoreOrderCountByParam" 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>