Merge branch 'developer' of git.caimei365.com:chao/caimei-modules-soa into developerA

product/src/main/resources/com-caimei-module-product/ProductModuleMapper.xml

@@ -396,7 +396,6 @@
 		cshd.productQuality AS "productQuality",
 		cshd.productDetails AS "productDetails",
 		cshd.viewingNum AS "viewingNum",
-		cshd.brandName AS "brandName",
 		cshd.payStatus AS "payStatus",
 		cshd.payAmount AS "payAmount",
 		cshd.payFormData AS "payFormData",