From ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 10 十一月 2026 09:15:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/resources/mapper/project/ServiceDistributedetailMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDistributedetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDistributedetailMapper.xml
index 778a2c2..ef85a5e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDistributedetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDistributedetailMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDistributedetailMapper">
- <resultMap type="ServiceDistributedetail" id="ServiceDistributedetailResult">
+ <resultMap type="com.ruoyi.project.domain.ServiceDistributedetail" id="ServiceDistributedetailResult">
<result property="id" column="ID" />
<result property="dsid" column="DSID" />
<result property="beneficiaryname" column="BeneficiaryName" />
@@ -35,7 +35,7 @@
<result property="prepaidamount" column="PrepaidAmount" />
<result property="remark" column="Remark" />
<result property="recordstatus" column="RecordStatus" />
- <result property="delFlag" column="del_flag" />
+ <result property="del_flag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@@ -48,7 +48,7 @@
select ID, DSID, BeneficiaryName, BeneficiaryNo, UnitName, UnitNo, UnitUserNo, Title, IDCardType, IDCardNo, Sex, FamilyRelations, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexRegistForm, ApplyType, ItemID, ItemName, ItemType, Quantity, Price, Amount, TaxAmount, TaxedAmount, PrepaidAmount, Remark, RecordStatus, del_flag, create_by, create_time, update_by, update_time, uploadflag, uploadtime from service_distributedetail
</sql>
- <select id="selectServiceDistributedetailList" parameterType="ServiceDistributedetail" resultMap="ServiceDistributedetailResult">
+ <select id="selectServiceDistributedetailList" parameterType="com.ruoyi.project.domain.ServiceDistributedetail" resultMap="ServiceDistributedetailResult">
<include refid="selectServiceDistributedetailVo"/>
<where>
<if test="beneficiaryname != null and beneficiaryname != ''"> and BeneficiaryName like concat('%', #{beneficiaryname}, '%')</if>
--
Gitblit v1.9.3