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

src/main/resources/mapper/svip/CmSvipHistoryDao.xml

@@ -354,12 +354,10 @@
     </select>
     <select id="newCmShopGet" resultType="com.caimei365.manager.entity.caimei.svip.NewCmShop">
         SELECT
-        <include refid="newCmShopColumns"/>,
-        copi.validFlag AS "validFlag",
+        <include refid="newCmShopColumns"/>
         FROM shop a
         <include refid="newCmShopJoins"/>
-        LEFT JOIN cm_organize_product_info copi ON copi.productId = p.productId
-        WHERE a.shopID = #{id} and copi.organizeId = 0
+        WHERE a.shopID = #{id}
     </select>
     <select id="findRedemptionCodeNum" resultType="java.lang.Integer">
         SELECT COUNT(id) FROM cm_coupon_redemption_code WHERE couponId = #{couponId}