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

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -718,6 +718,7 @@
         LEFT JOIN club c ON c.userID = a.userID
         <where>
             (s.shopId = 1161 OR s.AccountOwnership = 0 OR a.splitCode = 'E1807059160' or a.ordertype = 2)
+            and a.shopStatus not in (4, 5)
             <if test="startTime != null and startTime != ''">
                 AND (a.orderTime &gt; #{startTime} OR a.orderTime = #{startTime})
             </if>