From 174051f74a5842466c68c0601832fbb5a952608e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 30 十二月 2022 18:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncGoodsService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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 34edadf..ea8e12d 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
@@ -35,14 +35,14 @@
     @PostMapping(value = "/sync/goods/category/delete")
     Result deleteCategory(@RequestBody ConsumablesTypeDto consumablesType);
     /**
-     * 鍒犻櫎鎸囧畾ID鍒嗙被鑺傜偣 - 鍚勭被鍨嬮�氱敤
+     * 鏂板缓鐗╂枡绫绘暟鎹�
      * @param consumables
      * @return 鎿嶄綔鎴愬姛鐨勮瘽result.data杩斿洖棰嗗缓id
      */
     @PostMapping(value = "/sync/goods/product/add")
     Result addProduct(@RequestBody ConsumablesDto consumables);
     /**
-     * 鍒犻櫎鎸囧畾ID鍒嗙被鑺傜偣 - 鍚勭被鍨嬮�氱敤
+     * 淇敼鐗╂枡绫绘暟鎹�
      * @param consumables
      * @return
      */

--
Gitblit v1.8.0