From af2f1450e22d4b65e0013733e08025cdcd075b31 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 23 四月 2025 18:20:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml
index d6cd2e3..dc81ab9 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml
@@ -84,7 +84,7 @@
             <if test="type != null">type = #{type},</if>
             <if test="effectiveDate != null">effective_date = #{effectiveDate},</if>
             <if test="expiringDate != null">expiring_date = #{expiringDate},</if>
-            <if test="content != null">content = #{content},</if>
+            <if test="content != null">content = #{content , typeHandler=com.aps.core.typeHandler.JsonTypeHandler, jdbcType=OTHER},</if>
             <if test="applicableFactory != null">applicable_factory = #{applicableFactory},</if>
             <if test="applicableWorkshop != null">applicable_workshop = #{applicableWorkshop},</if>
             <if test="applicableProcess != null">applicable_process = #{applicableProcess},</if>

--
Gitblit v1.9.3