From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-activity/src/main/resources/mapper/CouponMapper.tld | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/cloud-server-activity/src/main/resources/mapper/CouponMapper.tld b/cloud-server-activity/src/main/resources/mapper/CouponMapper.tld
index 54e765b..211e6e5 100644
--- a/cloud-server-activity/src/main/resources/mapper/CouponMapper.tld
+++ b/cloud-server-activity/src/main/resources/mapper/CouponMapper.tld
@@ -4,31 +4,31 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsh.activity.entity.Coupon">
- <id column="id" property="id" />
- <result column="name" property="name" />
- <result column="type" property="type" />
- <result column="content" property="content" />
- <result column="illustrate" property="illustrate" />
- <result column="distributionMethod" property="distributionMethod" />
- <result column="redemptionMethod" property="redemptionMethod" />
- <result column="cash" property="cash" />
- <result column="integral" property="integral" />
- <result column="userPopulation" property="userPopulation" />
- <result column="quantityIssued" property="quantityIssued" />
- <result column="pickUpQuantity" property="pickUpQuantity" />
- <result column="startTime" property="startTime" />
- <result column="endTime" property="endTime" />
- <result column="useScope" property="useScope" />
- <result column="province" property="province" />
- <result column="provinceCode" property="provinceCode" />
- <result column="city" property="city" />
- <result column="cityCode" property="cityCode" />
- <result column="auditStatus" property="auditStatus" />
- <result column="auditUserId" property="auditUserId" />
- <result column="auditRemark" property="auditRemark" />
- <result column="status" property="status" />
- <result column="state" property="state" />
- <result column="insertTime" property="insertTime" />
+ <id column="id" property="id"/>
+ <result column="name" property="name"/>
+ <result column="type" property="type"/>
+ <result column="content" property="content"/>
+ <result column="illustrate" property="illustrate"/>
+ <result column="distributionMethod" property="distributionMethod"/>
+ <result column="redemptionMethod" property="redemptionMethod"/>
+ <result column="cash" property="cash"/>
+ <result column="integral" property="integral"/>
+ <result column="userPopulation" property="userPopulation"/>
+ <result column="quantityIssued" property="quantityIssued"/>
+ <result column="pickUpQuantity" property="pickUpQuantity"/>
+ <result column="startTime" property="startTime"/>
+ <result column="endTime" property="endTime"/>
+ <result column="useScope" property="useScope"/>
+ <result column="province" property="province"/>
+ <result column="provinceCode" property="provinceCode"/>
+ <result column="city" property="city"/>
+ <result column="cityCode" property="cityCode"/>
+ <result column="auditStatus" property="auditStatus"/>
+ <result column="auditUserId" property="auditUserId"/>
+ <result column="auditRemark" property="auditRemark"/>
+ <result column="status" property="status"/>
+ <result column="state" property="state"/>
+ <result column="insertTime" property="insertTime"/>
</resultMap>
</mapper>
--
Gitblit v1.7.1