合并供应链代码

yudao-module-bill/yudao-module-bill-server/src/main/java/cn/iocoder/yudao/module/bill/BillServerApplication.java

@@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  *
  * @author ZT
  */
-@SpringBootApplication
+//@SpringBootApplication
 public class BillServerApplication {
 
     public static void main(String[] args) {

yudao-module-bill/yudao-module-bill-server/src/main/java/cn/iocoder/yudao/module/bill/controller/admin/bill/BillController.java

@@ -1,12 +1,13 @@
 package cn.iocoder.yudao.module.bill.controller.admin.bill;
 
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 /**

yudao-module-bill/yudao-module-bill-server/src/main/java/cn/iocoder/yudao/module/bill/framework/rpc/config/RpcConfiguration.java

@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.module.bill.framework.rpc.config;
+
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration(value = "billRpcConfiguration", proxyBeanMethods = false)
+@EnableFeignClients(clients = {DeptApi.class})
+public class RpcConfiguration {
+}

yudao-module-bill/yudao-module-bill-server/src/main/java/cn/iocoder/yudao/module/bill/framework/security/config/SecurityConfiguration.java

@@ -9,11 +9,9 @@ import org.springframework.security.config.annotation.web.configurers.AuthorizeH
 
 
 /**
- * Bill 模块的 Security 配置
- *
- * @author ZT
+ * Template 模块的 Security 配置
  */
-@Configuration(proxyBeanMethods = false)
+@Configuration("billSecurityConfiguration")
 public class SecurityConfiguration {
 
     @Bean