From 831e3312572cf29dd91cbd882ef3dce809ac852d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 14 六月 2023 20:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/AppUserMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/AppUserMapper.xml b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/AppUserMapper.xml
index 235b934..e067251 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/AppUserMapper.xml
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/AppUserMapper.xml
@@ -21,5 +21,7 @@
<result column="remark" property="remark"/>
<result column="inviterType" property="inviterType"/>
<result column="inviterId" property="inviterId"/>
+ <result column="cancelCount" property="cancelCount"/>
+ <result column="havDiscount" property="havDiscount"/>
</resultMap>
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1