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

src/main/resources/mapper/ShopMapper.xml

@@ -561,12 +561,18 @@
         <where>
             <if test="bigTypeId != null">
                 b.bigTypeID = #{bigTypeId}
+                AND b.wwwValidFlag = 1
+                AND b.crmValidFlag = 1
             </if>
             <if test="smallTypeId != null">
                 and s.smallTypeID = #{smallTypeId}
+                AND s.wwwValidFlag = 1
+                AND s.crmValidFlag = 1
             </if>
             <if test="tinyTypeId != null">
                 and t.tinyTypeID = #{tinyTypeId}
+                AND t.wwwValidFlag = 1
+                AND t.crmValidFlag = 1
             </if>
         </where>
     </select>