From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceivePage.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceivePage.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceivePage.java
index 0044640..39e3872 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceivePage.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceivePage.java
@@ -39,14 +39,14 @@
      */
     @Excel(name = "浠撳簱id", width = 15)
     @ApiModelProperty(value = "浠撳簱id")
-    private String warehouseId;
+    private java.lang.String warehouseId;
     /**
      * 棰嗙敤閮ㄩ棬ID
      */
     @Excel(name = "棰嗙敤閮ㄩ棬ID", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
     @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
     @ApiModelProperty(value = "棰嗙敤閮ㄩ棬ID")
-    private String departId;
+    private java.lang.String departId;
     /**
      * 棰嗙敤浜篿d
      */

--
Gitblit v1.9.3