From 21db21a114356e0704a3483c1a3f22b96ea6658b Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Wed, 07 Apr 2021 16:26:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml index 0540354..9fd47fb 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml @@ -979,7 +979,7 @@ select b.su_name name, b.su_id id, - b.SHOP_IMAG photo, + 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 -- Gitblit v1.9.1