Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	share-system/src/main/java/share/system/service/OrderPayService.java

share-system/src/main/java/share/system/domain/SStore.java

@@ -76,6 +76,9 @@ public class SStore extends BaseEntity
     @Excel(name = "结束营业时间")
     private String openEndTime;
 
+    @Excel(name = "保洁时段")
+    private String cleaningPeriod;
+
     /** 门店类型 1:标准店 2: 形象店 3:旗舰店 */
     @Excel(name = "门店类型 1:标准店 2: 形象店 3:旗舰店")
     private String storeType;

share-system/src/main/resources/mapper/system/SStoreMapper.xml

@@ -25,6 +25,7 @@
         <result property="status"    column="status"    />
         <result property="openStartTime"    column="open_start_time"    />
         <result property="openEndTime"    column="open_end_time"    />
+        <result property="cleaningPeriod" column="cleaning_period"/>
         <result property="storeType"    column="store_type"    />
     </resultMap>
 
@@ -49,6 +50,7 @@
                status,
                open_start_time,
                open_end_time,
+               cleaning_period,
                store_type
         from s_store
     </sql>
@@ -71,6 +73,7 @@
             <if test="openStartTime != null "> and open_start_time = #{openStartTime}</if>
             <if test="openEndTime != null "> and open_end_time = #{openEndTime}</if>
             <if test="storeType != null "> and store_type = #{storeType}</if>
+            <if test="cleaningPeriod != null ">and cleaning_period = #{cleaningPeriod}</if>
         </where>
        order by create_time desc
     </select>
@@ -107,6 +110,7 @@
             <if test="openStartTime != null">open_start_time,</if>
             <if test="openEndTime != null">open_end_time,</if>
             <if test="storeType != null">store_type,</if>
+            <if test="cleaningPeriod != null">cleaning_period,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
@@ -129,6 +133,7 @@
             <if test="openStartTime != null">#{openStartTime},</if>
             <if test="openEndTime != null">#{openEndTime},</if>
             <if test="storeType != null">#{storeType},</if>
+            <if test="cleaningPeriod != null">#{cleaningPeriod},</if>
         </trim>
     </insert>
 
@@ -152,9 +157,10 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="status != null">status = #{status},</if>
-            <if test="openStartTime != null">open_start_time = #{openStartTime},</if>
-            <if test="openEndTime != null">open_end_time = #{openEndTime},</if>
+            <if test="openStartTime != ''">open_start_time = #{openStartTime},</if>
+            <if test="openEndTime != ''">open_end_time = #{openEndTime},</if>
             <if test="storeType != null">store_type = #{storeType},</if>
+            <if test="cleaningPeriod != ''">cleaning_period = #{cleaningPeriod},</if>
         </trim>
         where id = #{id}
     </update>