From 830bb157b5e46a6c041d5f0c0a883a22e37cb0f7 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 19 三月 2026 10:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz-spring3.5' into devlop-phyz-spring3.5

---
 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Warehouse.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Warehouse.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Warehouse.java
index 36e9e02..91a8167 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Warehouse.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/Warehouse.java
@@ -1,5 +1,6 @@
 package com.vincent.rsf.openApi.entity.phyz;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -27,7 +28,8 @@
     private String useOrgId;
     // 浣跨敤缁勭粐鍚嶇О
     private String useOrgName;
-    // 鎿嶄綔绫诲瀷锛�1 鏂板锛�2 淇敼锛�3绂佺敤锛�4 鍙嶇鐢紱
+    // 鎿嶄綔绫诲瀷锛�0锛氭柊澧炪�佹洿鏂般�佽В绂侊紙鍙璋冪敤浜嗘洿鏂帮紝灏变唬琛ㄩ潪绂佺敤浜嗭級  1锛氱鐢�
+    @JSONField(name = "OperateType", alternateNames = {"operateType"})
     @JsonProperty("operateType")
     private Integer operateType;
 }

--
Gitblit v1.9.1