feat():修改多数据源信息

muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java

@@ -39,9 +39,9 @@ public class ManyDataSource {
             DruidDataSourceFactory druidDataSourceFactory= SpringUtils.getBean(DruidDataSourceFactory.class);
             DynamicDataSource dynamicDataSource= SpringUtils.getBean(DynamicDataSource.class);
             EnterPriseInfo enterPriseInfo = EnterPriseInfo.builder()
-                    .entCode("liu_0605")
+                    .entCode("liu_42")
                     .ip("192.168.116.129")
-                    .port(3309)
+                    .port(3348)
                     .build();
 
             DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(enterPriseInfo.getEntCode(), enterPriseInfo.getIp(), enterPriseInfo.getPort());
@@ -55,9 +55,9 @@ public class ManyDataSource {
         List<EnterPriseInfo> list = new ArrayList<>();
         list.add(
                 EnterPriseInfo.builder()
-                        .entCode("liu_0608")
+                        .entCode("liu_44")
                         .ip("192.168.116.129")
-                        .port(3310)
+                        .port(3350)
                         .build()
         );
         return list;

muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java

@@ -183,6 +183,12 @@ public class EnterpriseController extends BaseController {
         return toAjax(enterpriseService.removeBatchByIds(ids));
     }
 
+    /**
+     * 完善企业信息
+     * @param id
+     * @param enterpriseEditReq
+     * @return
+     */
     @PostMapping("/updateEnterprise/{id}")
     public Result<String> updateEnterprise(@PathVariable Integer id, @RequestBody EnterpriseEditReq enterpriseEditReq) {
         return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq)));
@@ -194,9 +200,6 @@ public class EnterpriseController extends BaseController {
     @PostMapping("/authentication")
     public Result<String> authentication(@RequestBody Enterprise enterprise ) {
         enterpriseService.authentication(enterprise);
-        if(!enterprise.getEnterpriseStatus().equals("Y")){
-            return Result.error("已经审核完成");
-        }
         return Result.success();
     }
 }

muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -49,7 +49,6 @@
     <sql id="selectUserVo">
         select u.user_id,
                u.dept_id,
-               u.type,
                u.user_name,
                u.nick_name,
                u.email,