From 2a7a159b136805612e241e4e8e24affedfc23cc2 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 20 Nov 2021 21:07:43 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
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