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

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

@@ -378,7 +378,7 @@
 
     <select id="getSeconHandProductList" resultType="com.caimei.module.base.entity.po.SeconHandProduct">
         SELECT
-	        IF(p.brandID != 161,cb.name ,cshd.brandName) as "brandName",p.*,cb.*,cshd.*
+	        IF(p.brandID != 161,cb.name ,cshd.brandName) as "brandName",p.*,cshd.*
         FROM
             product p
         LEFT JOIN cm_second_hand_detail cshd ON p.productID = cshd.productID