From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 14:24:50 +0800
Subject: [PATCH] 1、git同步冲突引起文件丢失，进行系统恢复，并屏蔽一个非git提交的模块； 2、增加文件《增加一个单位（orgTag）》。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml
index 0f871af..ffae3bb 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SePaymentMethodMapper.xml
@@ -25,17 +25,20 @@
delete from se_payment_method
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SePaymentMethod" useGeneratedKeys="true">
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SePaymentMethod" >
<!--@mbg.generated-->
- insert into se_payment_method (`name`, remarks, deleted
+ insert into se_payment_method (id, `name`, remarks, deleted
)
- values (#{name,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{deleted,jdbcType=TINYINT}
+ values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{deleted,jdbcType=TINYINT}
)
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SePaymentMethod" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into se_payment_method
<trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
<if test="name != null">
`name`,
</if>
@@ -47,6 +50,9 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
--
Gitblit v1.8.0