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

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/mapper/ProductLaunchMapper.xml

@@ -206,19 +206,7 @@
             and ppl.whether_integral = #{whetherIntegral}
         </if>
         GROUP BY
-        ppl.id,
-        psd.CODE,
-        ppl.cname,
-        ppl.bill_type,
-        ppl.brand_id,
-        ppl.price_one,
-        ppl.price_two ,
-        ppl.price_three,
-        ppl.price_four ,
-        ppl.inventory,
-        ppl.brand_item,
-        ppl.suggested_retail_price,
-        ppl.cname_int
+        ppl.id
         ) allGoods
         <if test="brandId != null or brandName != null  and brandName != ''">
             order by  cnameInt, sort DESC