From b0dd9d6625773ab7e20e8f677cd5eb7be4bf77cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E8=88=AA=E8=80=81=E9=BD=90?= <280645618@qq.com>
Date: Thu, 15 Jan 2026 10:44:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B2=BE=E7=AE=80=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/erp-api/pom.xml                                    | 10 +++++-----
 .../erp}/controller/GoodsBrandController.java          |  2 +-
 .../erp}/controller/GoodsCategoryController.java       |  2 +-
 .../cn/qihangerp/erp}/controller/GoodsController.java  |  2 +-
 .../erp}/controller/GoodsInventoryController.java      |  2 +-
 .../erp}/controller/GoodsSupplierController.java       |  2 +-
 microservices/pom.xml                                  |  2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename {microservices/goods-api/src/main/java/cn/qihangerp/api/goods => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/GoodsBrandController.java (97%)
 rename {microservices/goods-api/src/main/java/cn/qihangerp/api/goods => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/GoodsCategoryController.java (99%)
 rename {microservices/goods-api/src/main/java/cn/qihangerp/api/goods => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/GoodsController.java (99%)
 rename {microservices/goods-api/src/main/java/cn/qihangerp/api/goods => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/GoodsInventoryController.java (97%)
 rename {microservices/goods-api/src/main/java/cn/qihangerp/api/goods => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/GoodsSupplierController.java (97%)

diff --git a/api/erp-api/pom.xml b/api/erp-api/pom.xml
index 59fd5c17..ae7081ea 100644
--- a/api/erp-api/pom.xml
+++ b/api/erp-api/pom.xml
@@ -102,11 +102,11 @@
             <version>2.0.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>cn.qihangerp.services</groupId>
-            <artifactId>goods-api</artifactId>
-            <version>1.0.6</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.qihangerp.services</groupId>-->
+<!--            <artifactId>goods-api</artifactId>-->
+<!--            <version>1.0.6</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>cn.qihangerp.service</groupId>
             <artifactId>order</artifactId>
diff --git a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsBrandController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsBrandController.java
similarity index 97%
rename from microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsBrandController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsBrandController.java
index af0e9331..9c0ed744 100644
--- a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsBrandController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsBrandController.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.goods.controller;
+package cn.qihangerp.erp.controller;
 
 
 import cn.qihangerp.common.AjaxResult;
diff --git a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsCategoryController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsCategoryController.java
similarity index 99%
rename from microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsCategoryController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsCategoryController.java
index 8e5fc300..4f00b009 100644
--- a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsCategoryController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsCategoryController.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.goods.controller;
+package cn.qihangerp.erp.controller;
 
 
 
diff --git a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsController.java
similarity index 99%
rename from microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsController.java
index 0c208eb7..f691399e 100644
--- a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsController.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.goods.controller;
+package cn.qihangerp.erp.controller;
 
 import cn.qihangerp.common.*;
 import cn.qihangerp.model.entity.OGoods;
diff --git a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsInventoryController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsInventoryController.java
similarity index 97%
rename from microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsInventoryController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsInventoryController.java
index 53a81614..b7817234 100644
--- a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsInventoryController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsInventoryController.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.goods.controller;
+package cn.qihangerp.erp.controller;
 
 
 import cn.qihangerp.common.AjaxResult;
diff --git a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsSupplierController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsSupplierController.java
similarity index 97%
rename from microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsSupplierController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsSupplierController.java
index 2b4ba101..03f75a33 100644
--- a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsSupplierController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsSupplierController.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.goods.controller;
+package cn.qihangerp.erp.controller;
 
 
 import cn.qihangerp.common.AjaxResult;
diff --git a/microservices/pom.xml b/microservices/pom.xml
index e1892485..2078b8f7 100644
--- a/microservices/pom.xml
+++ b/microservices/pom.xml
@@ -16,7 +16,7 @@
     <name>microservices</name>
     <url>http://maven.apache.org</url>
     <modules>
-        <module>goods-api</module>
+<!--        <module>goods-api</module>-->
         <module>order-api</module>
         <module>jd-api</module>
 <!--        <module>dou-api</module>-->