From 512a2f0fb09b663b8de19b5313c8bd5899f4f74b Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Tue, 06 Apr 2021 09:44:06 +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/activity/ActivitySignReceiveRecordDao.xml | 35 +---------------------------------- 1 files changed, 1 insertions(+), 34 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml index 53ca3c5..c983585 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml @@ -3,40 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.matrix.system.activity.dao.ActivitySignReceiveRecordDao"> - <!-- 定义ActivitySignReceiveRecord 的复杂关联map --> - <resultMap type="com.matrix.system.activity.entity.ActivitySignReceiveRecord" id="ActivitySignReceiveRecordMap"> - <id property="id" column="id" /> - <result property="createBy" column="create_by" /> - <result property="createTime" column="create_time" /> - <result property="updateBy" column="update_by" /> - <result property="updateTime" column="update_time" /> - <result property="openId" column="open_id" /> - <result property="receiveTime" column="receive_time" /> - <result property="remark" column="remark" /> - <result property="awardId" column="award_id" /> - <result property="state" column="state" /> - <result property="writeOffCode" column="write_off_code" /> - <result property="activityId" column="activity_id" /> - <result property="companyId" column="company_id" /> - </resultMap> - - - <!-- 定义ActivitySignReceiveRecord 的简单map ，本map不添加其他的关联属性 --> - <resultMap type="com.matrix.system.activity.entity.ActivitySignReceiveRecord" id="ActivitySignReceiveRecordSimpleMap"> - <id property="id" column="id" /> - <result property="createBy" column="create_by" /> - <result property="createTime" column="create_time" /> - <result property="updateBy" column="update_by" /> - <result property="updateTime" column="update_time" /> - <result property="openId" column="open_id" /> - <result property="receiveTime" column="receive_time" /> - <result property="remark" column="remark" /> - <result property="awardId" column="award_id" /> - <result property="state" column="state" /> - <result property="writeOffCode" column="write_off_code" /> - <result property="activityId" column="activity_id" /> - <result property="companyId" column="company_id" /> - </resultMap> + <select id="findSignReceiveList" resultType="com.matrix.system.activity.vo.SignReceiveListVo"> SELECT -- Gitblit v1.9.1