From a4ed3499532ea026bb6f635102069e6b28b26ae7 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期二, 06 十二月 2022 18:51:43 +0800
Subject: [PATCH] 新增,修改,删除领建商品分类到领建,新增,修改商品到领建

---
 phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncGoodsService.java |   15 +++++++--------
 phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java         |    2 +-
 phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java     |    2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/material/Consumables.java b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java
similarity index 97%
rename from phis-feign/src/main/java/com/hz/his/dto/material/Consumables.java
rename to phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java
index b441c9c..00c5bcd 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/material/Consumables.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java
@@ -6,7 +6,7 @@
  * @Author 鍟嗗搧
  */
 @Data
-public class Consumables {
+public class ConsumablesDto {
 
     /** 涓枃绠�绉�  */
     private String aliasCHS;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesType.java b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java
similarity index 93%
rename from phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesType.java
rename to phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java
index b2abe20..92f0a30 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesType.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesTypeDto.java
@@ -6,7 +6,7 @@
  * @Author  鐗╂枡鍒嗙被
  */
 @Data
-public class ConsumablesType {
+public class ConsumablesTypeDto {
 
     /** 鍚嶇О 蹇呭~ */
     private String remarks;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncGoodsService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncGoodsService.java
index 2a68bc7..34edadf 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncGoodsService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncGoodsService.java
@@ -1,9 +1,8 @@
 package com.hz.his.feign.service.sync;
 
-import com.alibaba.fastjson.JSONObject;
 import com.hx.resultTool.Result;
-import com.hz.his.dto.material.Consumables;
-import com.hz.his.dto.material.ConsumablesType;
+import com.hz.his.dto.material.ConsumablesDto;
+import com.hz.his.dto.material.ConsumablesTypeDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,33 +19,33 @@
      * @return 鎿嶄綔鎴愬姛鐨勮瘽result.data杩斿洖棰嗗缓id
      */
     @PostMapping(value = "/sync/goods/category/add")
-    Result addCategory(@RequestBody ConsumablesType consumablesType);
+    Result addCategory(@RequestBody ConsumablesTypeDto consumablesType);
     /**
      * 淇敼鎸囧畾ID鍒嗙被鑺傜偣 - 鍚勭被鍨嬮�氱敤
      * @param consumablesType
      * @return
      */
     @PostMapping(value = "/sync/goods/category/update")
-    Result updateCategory(@RequestBody ConsumablesType consumablesType);
+    Result updateCategory(@RequestBody ConsumablesTypeDto consumablesType);
     /**
      * 鍒犻櫎鎸囧畾ID鍒嗙被鑺傜偣 - 鍚勭被鍨嬮�氱敤
      * @param consumablesType
      * @return
      */
     @PostMapping(value = "/sync/goods/category/delete")
-    Result deleteCategory(@RequestBody ConsumablesType consumablesType);
+    Result deleteCategory(@RequestBody ConsumablesTypeDto consumablesType);
     /**
      * 鍒犻櫎鎸囧畾ID鍒嗙被鑺傜偣 - 鍚勭被鍨嬮�氱敤
      * @param consumables
      * @return 鎿嶄綔鎴愬姛鐨勮瘽result.data杩斿洖棰嗗缓id
      */
     @PostMapping(value = "/sync/goods/product/add")
-    Result addProduct(@RequestBody Consumables consumables);
+    Result addProduct(@RequestBody ConsumablesDto consumables);
     /**
      * 鍒犻櫎鎸囧畾ID鍒嗙被鑺傜偣 - 鍚勭被鍨嬮�氱敤
      * @param consumables
      * @return
      */
     @PostMapping(value = "/sync/goods/product/update")
-    Result updateProduct(@RequestBody Consumables consumables);
+    Result updateProduct(@RequestBody ConsumablesDto consumables);
 }

--
Gitblit v1.8.0