From b864ea85f84cee2df8616f4eb5757f5f3f1a5c43 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 19 Jan 2026 15:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.11rg' into 1.11rg

---
 src/main/java/com/nq/dao/UserPositionMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nq/dao/UserPositionMapper.java b/src/main/java/com/nq/dao/UserPositionMapper.java
index d76a1f6..26e86e3 100644
--- a/src/main/java/com/nq/dao/UserPositionMapper.java
+++ b/src/main/java/com/nq/dao/UserPositionMapper.java
@@ -10,7 +10,7 @@
 public interface UserPositionMapper extends BaseMapper<UserPosition> {
   int deleteByPrimaryKey(Integer paramInteger);
   
-  int insert(UserPosition paramUserPosition);
+//  int insert(UserPosition paramUserPosition);
   
   int insertSelective(UserPosition paramUserPosition);
   

--
Gitblit v1.9.3