From 49eee4769a63b0c24d19bd676cdb0eb0df0a6541 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 20 五月 2025 18:32:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialProductGroupManagementMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialProductGroupManagementMapper.xml
index 37b7ace..73a5bd1 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialProductGroupManagementMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialProductGroupManagementMapper.xml
@@ -69,8 +69,6 @@
             <if test="factory != null">factory = #{factory},</if>
             <if test="materialCode != null">material_code = #{materialCode},</if>
             <if test="domain != null">domain = #{domain},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isMain != null">is_main = #{isMain},</if>

--
Gitblit v1.9.3