Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

src/main/java/com/style24/persistence/mybatis/shop/TsaMorebetter.xml

@@ -670,6 +670,9 @@
 									WHERE	A.TMTB_ST_DT <![CDATA[<=]]> NOW()
 									AND 	A.TMTB_ED_DT <![CDATA[>=]]> NOW()
 									AND 	A.TMTB_STAT = 'G232_11'
+		                            <if test="tmtbSq != null and tmtbSq != ''">
+									AND     A.TMTB_SQ <![CDATA[<>]]> #{tmtbSq}
+									</if>
 									AND 	B.GOODS_GB <![CDATA[<>]]> 'G800_30'
 								)
 	</insert>