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

sp-service/level-one-server/src/main/java/com/pj/tb_goods/TbGoodsMapper.xml

@@ -65,7 +65,7 @@
 		select g.* from tb_goods g
 		left join re_trade_area_goods ta on g.id = ta.goods_id
 		where ta.area_id = #{tradeAreaId}
-
+		<if test=' this.has("typeNames") '> and g.type_names = #{typeNames} </if>
 	</select>