Merge remote-tracking branch 'origin/server_five_yuanyonghao' into server_five_xiaoyao

# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml

couplet-auth/src/main/resources/bootstrap.yml

@@ -4,6 +4,8 @@ server:
 
 # Spring
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     # 应用名称
     name: couplet-auth
@@ -23,5 +25,3 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-  main:
-    allow-bean-definition-overriding: true

couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java

@@ -40,6 +40,10 @@ public class SysDept extends BaseEntity {
      */
     private Long parentId;
 
+
+    @TableField(exist = false)
+    private String remark;
+
     /**
      * 祖级列表
      */

couplet-modules/couplet-gen/src/main/resources/bootstrap.yml

@@ -4,6 +4,8 @@ server:
 
 # Spring
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     # 应用名称
     name: couplet-gen

couplet-modules/couplet-job/src/main/resources/bootstrap.yml

@@ -4,6 +4,8 @@ server:
 
 # Spring
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     # 应用名称
     name: couplet-job

couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysFirmController.java

@@ -66,7 +66,7 @@ public class SysFirmController {
      * @param deptId
      * @return com.couplet.common.core.domain.Result
     **/
-    @DeleteMapping("delFirm/{deptId}")
+    @PostMapping("delFirm/{deptId}")
     public Result delFirm(@PathVariable Integer deptId){
         int i = sysFirmService.delFirm(deptId);
         Result<Integer> success = Result.success(i);

couplet-modules/couplet-system/src/main/java/com/couplet/system/service/impl/SysDeptServiceImpl.java

@@ -223,7 +223,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      * @return 结果
      */
     @Override
-    public int updateDept (SysDept dept) {
+    public int  updateDept (SysDept dept) {
         SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
         SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
         if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) {

couplet-modules/couplet-system/src/main/resources/bootstrap.yml

@@ -4,6 +4,8 @@ server:
 
 # Spring
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     # 应用名称
     name: couplet-system