@@ -122,19 +122,7 @@
and fpd.inventory > #{inventoryStatus}
</if>
GROUP BY
- fpd.goods_code,
- fpd.id,
- fpd.goods_name ,
- fpd.bill_type ,
- fpd.brand_id ,
- fpd.price_one,
- fpd.price_two,
- fpd.price_three ,
- fpd.price_four ,
- fpd.brand_item ,
- fpd.cname_int ,
- fpd.inventory,
- fpd.suggestedRetailPrice
+ fpd.goods_code
) AS allGoods
<if test="brandId != null or brandName != null and brandName != ''">
order by cnameInt, sort DESC