Merge branch 'developer' into developerA

src/main/resources/mapper/OrderSellerMapper.xml

@@ -225,7 +225,7 @@
     </select>
     <select id="getSellerOrderCount" resultType="java.lang.Integer">
         SELECT COUNT(*) FROM cm_order
-        WHERE delFlag = 0 AND userID = IN
+        WHERE delFlag = 0 AND userID IN
         <foreach item="userId" index="index" collection="userIds" open="(" separator="," close=")">
             #{userId}
         </foreach>