parent: dc13a869 | patch | commit | ignore whitespace
xiaoyong931011
2021-04-07 894cde4d057b5805177a8af046a97580030de066 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

 Conflicts:
	zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java
1 files modified
1 ■■■■■ changed files
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 1 ●●●●● patch | view | raw | blame | history 
 zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml


@@ -979,6 +979,7 @@


        select


            b.su_name name,


            b.su_id id,


            b.su_photo photo,


            sum(IFNULL(a.free_consume,0) + IFNULL(a.his_consume, 0) ) amount,


            c.shop_short_name shopName


        from achieve_new a