fix 开店管理增加合同签约，门店编码trim 修复导出字段没值

coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml

@@ -295,7 +295,13 @@
         a.shop_status as shopStatus,
         a.detail_address as shopAddress
         from xfsg_shop_info a left join xfsg_line_info b on a.line_id = b.id
+        <if test="request.contractStartTime !=null and request.contractEndTime != null">
+            left join xfsg_sign_franchise c on a.id = c.shop_id
+        </if>
         where a.deleted = 0
+        <if test="request.contractStartTime !=null and request.contractEndTime !=null">
+            and c.create_time between #{request.contractStartTime} and #{request.contractEndTime}
+        </if>
         <if test="request.partnerKeyword != null and request.partnerKeyword != ''">
             and (b.username like concat('%', #{request.partnerKeyword}, '%') or b.mobile like concat('%',
             #{request.partnerKeyword}, '%'))

coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml

@@ -285,6 +285,7 @@
                     #{regionId}
                 </foreach>
             </if>
+            order by a.update_time desc
         </where>
 
     </select>