From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpItemDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpItemDto.java
index 4eb212c..ac2bb47 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpItemDto.java
@@ -14,7 +14,7 @@
     /**
      * 绫诲瀷
      */
-    private String type;
+    private Integer type;
     /**
      * 鏍囪瘑
      */

--
Gitblit v1.8.0