소스 검색

Merge branch 'V2.0.1' into test

zhaoxian 3 년 전
부모
커밋
46e279cc9f

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/material/mapper/xml/ProductMaterialMapper.xml

@@ -68,7 +68,7 @@
         t1.trade_name as 'tradeName',
         t1.trade_type as 'tradeType',
         t1.item_run as 'itemRun',
-        IF(t4.videoCount is null ,'-',IFNULL(t2.charge,0.00)) as 'charge',
+        IF(t4.videoCount is null ,'-',IFNULL(sum(t2.charge),0.00)) as 'charge',
         CONCAT_WS(' ~ ',t1.start_month,t1.end_month) AS 'time',
         IFNULL(t3.realname,'-') as 'user',
         IFNULL(t4.videoCount ,'-') as 'videoCount'