From aecf1e6808cd9eca68f5ec87340bd6c92f8c464c Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 29 Jul 2021 20:40:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
index 144ab7e..709e6c9 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
@@ -131,8 +131,8 @@
a.count,
a.proj_id,
b.su_name,
- c.name as goods_name,
- c.seal_pice as goods_seal_pice,
+ d.proj_name as goods_name,
+ d.price as goods_seal_pice,
c.TIME_LENGTH as goods_time_length,
d.id as pu_id,
d.SURPLUS_COUNT as pu_SURPLUS_COUNT,
--
Gitblit v1.9.1