From 86d8700e7776bf44b8fb90df1823daf147a13b27 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 04 九月 2024 10:50:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
index 14805e5..1138d58 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
@@ -100,10 +100,10 @@
<if test="errorMsg != null and errorMsg !=''">error_msg,</if>
<if test="assistants != null and assistants !=''">assistants,</if>
<if test="updatedBy != null">updated_by,</if>
- <if test="inTime != null and inTime !=''">in_time,</if>
- <if test="outTime != null and outTime !=''">out_time,</if>
- <if test="inLineTime != null and inLineTime !=''">in_line_time,</if>
- <if test="outLineTime != null and outLineTime !=''">out_line_time,</if>
+ <if test="inTime != null">in_time,</if>
+ <if test="outTime != null">out_time,</if>
+ <if test="inLineTime != null">in_line_time,</if>
+ <if test="outLineTime != null">out_line_time,</if>
<if test="memo != null and memo !=''">memo,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -121,10 +121,10 @@
<if test="errorMsg != null and errorMsg !=''">#{errorMsg,jdbcType=VARCHAR},</if>
<if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
<if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
- <if test="inTime != null and inTime !=''">#{inTime,jdbcType=TIMESTAMP},</if>
- <if test="outTime != null and outTime !=''">#{outTime,jdbcType=TIMESTAMP},</if>
- <if test="inLineTime != null and inLineTime !=''">#{inLineTime,jdbcType=TIMESTAMP},</if>
- <if test="outLineTime != null and outLineTime !=''">#{outLineTime,jdbcType=TIMESTAMP},</if>
+ <if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
+ <if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
+ <if test="inLineTime != null">#{inLineTime,jdbcType=TIMESTAMP},</if>
+ <if test="outLineTime != null">#{outLineTime,jdbcType=TIMESTAMP},</if>
<if test="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
</trim>
</insert>
@@ -170,16 +170,16 @@
<if test="updatedBy != null">
updated_by = #{updatedBy,jdbcType=BIGINT},
</if>
- <if test="inTime != null and inTime !=''">
+ <if test="inTime != null">
in_time = #{inTime,jdbcType=TIMESTAMP},
</if>
- <if test="outTime != null and outTime !=''">
+ <if test="outTime != null">
out_time = #{outTime,jdbcType=TIMESTAMP},
</if>
- <if test="inLineTime != null and inLineTime !=''">
+ <if test="inLineTime != null">
in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
</if>
- <if test="outLineTime != null and outLineTime !=''">
+ <if test="outLineTime != null">
out_line_time = #{outLineTime,jdbcType=TIMESTAMP},
</if>
<if test="memo != null and memo !=''">
--
Gitblit v1.8.0