From 53f98014e35bd2cfa6760128394e021c53ded550 Mon Sep 17 00:00:00 2001
From: RHY <1552567007@qq.com>
Date: Thu, 24 Apr 2025 18:33:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 .idea/workspace.xml                           | 50 ++++++++++++++++---
 .../com/ken/wms/util/aop/ServiceLogging.java  |  2 +-
 .../com/ken/wms/util/aop/UserOperation.java   |  2 +-
 WMS/src/test/java/com/ken/wms/MapperTest.java |  2 +-
 WMS/src/test/java/com/ken/wms/MyTest.java     |  2 +-
 5 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3dc4704..e05b431 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fc9e62f9-d23e-43be-9bb8-56d74e3a1d22" name="更改" comment="测试">
-      <change beforePath="$PROJECT_DIR$/WMS/src/main/java/com/ken/wms/common/controller/SystemLogHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/WMS/src/main/java/com/ken/wms/common/controller/SystemLogHandler.java" afterDir="false" />
+    <list default="true" id="fc9e62f9-d23e-43be-9bb8-56d74e3a1d22" name="更改" comment="Merge remote-tracking branch 'origin/master'">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -49,6 +49,11 @@
     "nodejs_package_manager_path": "npm",
     "settings.editor.selected.configurable": "vcs.Git",
     "vue.rearranger.settings.migration": "true"
+  },
+  "keyToStringList": {
+    "ChangesTree.GroupingKeys": [
+      "directory"
+    ]
   }
 }]]></component>
   <component name="SharedIndexes">
@@ -70,7 +75,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1745473836915</updated>
-      <workItem from="1745473838011" duration="3274000" />
+      <workItem from="1745473838011" duration="3977000" />
     </task>
     <task id="LOCAL-00001" summary="1">
       <option name="closed" value="true" />
@@ -96,7 +101,39 @@
       <option name="project" value="LOCAL" />
       <updated>1745487863962</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="测试">
+      <option name="closed" value="true" />
+      <created>1745489539593</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1745489539593</updated>
+    </task>
+    <task id="LOCAL-00005" summary="测试">
+      <option name="closed" value="true" />
+      <created>1745489716151</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1745489716151</updated>
+    </task>
+    <task id="LOCAL-00006" summary="测试">
+      <option name="closed" value="true" />
+      <created>1745489774121</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1745489774121</updated>
+    </task>
+    <task id="LOCAL-00007" summary="测试">
+      <option name="closed" value="true" />
+      <created>1745489930495</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1745489930495</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -123,7 +160,7 @@
                   <entry key="branch">
                     <value>
                       <list>
-                        <option value="master" />
+                        <option value="origin/main" />
                       </list>
                     </value>
                   </entry>
@@ -138,6 +175,7 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="1" />
     <MESSAGE value="测试" />
-    <option name="LAST_COMMIT_MESSAGE" value="测试" />
+    <MESSAGE value="Merge remote-tracking branch 'origin/master'" />
+    <option name="LAST_COMMIT_MESSAGE" value="Merge remote-tracking branch 'origin/master'" />
   </component>
 </project>
\ No newline at end of file
diff --git a/WMS/src/main/java/com/ken/wms/util/aop/ServiceLogging.java b/WMS/src/main/java/com/ken/wms/util/aop/ServiceLogging.java
index f658e6c..f10648c 100644
--- a/WMS/src/main/java/com/ken/wms/util/aop/ServiceLogging.java
+++ b/WMS/src/main/java/com/ken/wms/util/aop/ServiceLogging.java
@@ -3,7 +3,7 @@ package com.ken.wms.util.aop;
 import org.aspectj.lang.JoinPoint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
+///RHY
 
 /**
  * Service层日志处理
diff --git a/WMS/src/main/java/com/ken/wms/util/aop/UserOperation.java b/WMS/src/main/java/com/ken/wms/util/aop/UserOperation.java
index 682f1c5..3c57031 100644
--- a/WMS/src/main/java/com/ken/wms/util/aop/UserOperation.java
+++ b/WMS/src/main/java/com/ken/wms/util/aop/UserOperation.java
@@ -1,7 +1,7 @@
 package com.ken.wms.util.aop;
 
 import java.lang.annotation.*;
-
+//RHY
 /**
  * 用户操作注解
  * 用于标注用户操作的方法名称
diff --git a/WMS/src/test/java/com/ken/wms/MapperTest.java b/WMS/src/test/java/com/ken/wms/MapperTest.java
index 1c4f2bf..7937949 100644
--- a/WMS/src/test/java/com/ken/wms/MapperTest.java
+++ b/WMS/src/test/java/com/ken/wms/MapperTest.java
@@ -1,5 +1,5 @@
 package com.ken.wms;
-
+//RHY
 import com.ken.wms.common.service.Interface.StockRecordManageService;
 import com.ken.wms.common.service.Interface.SystemLogService;
 import com.ken.wms.dao.AccessRecordMapper;
diff --git a/WMS/src/test/java/com/ken/wms/MyTest.java b/WMS/src/test/java/com/ken/wms/MyTest.java
index 68eaa73..2df0c08 100644
--- a/WMS/src/test/java/com/ken/wms/MyTest.java
+++ b/WMS/src/test/java/com/ken/wms/MyTest.java
@@ -1,5 +1,5 @@
 package com.ken.wms;
-
+///RHY
 import com.ken.wms.security.util.MD5Util;
 
 public class MyTest {