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

src/main/resources/mappings/modules/baike/CmBaikeProductMapper.xml

@@ -153,7 +153,7 @@
 	</select>
     <select id="findShopList" resultType="com.caimei.modules.user.entity.NewCmShop">
 		select s.shopID,u.name from shop s
-						 LEFT JOIN user u ON u.userID = s.userID where s.status = 90 order by s.shopID desc;
+						 LEFT JOIN user u ON u.userID = s.userID where s.status = 90 and u.userID is not null order by s.shopID desc;
 	</select>
     <select id="checkFileName" resultType="java.lang.Integer">
 		select id from cm_baike_product_file