修改bug

pom.xml

@@ -26,7 +26,7 @@
     </modules>
 
     <name>${project.artifactId}</name>
-    <description>芋道项目基础脚手架</description>
+    <description>中康科项目基础脚手架</description>
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>

sql/mysql/ruoyi-vue-pro.sql

@@ -2188,7 +2188,7 @@ CREATE TABLE `system_notice`  (
 -- Records of system_notice
 -- ----------------------------
 BEGIN;
-INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, '芋道的公众', '<p>新版本内容133</p>', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', b'0', 1);
+INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, '中康科的公众', '<p>新版本内容133</p>', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', b'0', 1);
 INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, '维护通知：2018-07-01 系统凌晨维护', '<p><img src=\"http://test.sso.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg\" alt=\"\" data-href=\"\" style=\"\"/>11112222</p>', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2023-12-02 20:07:26', b'0', 1);
 INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (4, '我是测试标题', '<p>哈哈哈哈123</p>', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', b'0', 121);
 COMMIT;
@@ -3617,7 +3617,7 @@ CREATE TABLE `system_tenant`  (
 BEGIN;
 INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `website`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1, 'zkk', NULL, '芋艿', '17321315478', 0, 'poteviohealth', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2023-11-06 11:41:41', b'0');
 INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `website`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, '2024-03-11 00:00:00', 20, '1', '2022-02-22 00:56:14', '1', '2023-11-06 11:41:47', b'0');
-INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `website`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-30 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2023-11-06 11:41:53', b'0');
+INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `website`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (122, '测试租户', 113, '中康科', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-30 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2023-11-06 11:41:53', b'0');
 COMMIT;
 
 -- ----------------------------
@@ -3748,7 +3748,7 @@ CREATE TABLE `system_users`  (
 -- ----------------------------
 BEGIN;
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 'admin', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', 'zkk', '管理员', 103, '[1]', 'aoteman@126.com', '18818260277', 2, 'http://test.sso.iocoder.cn/96c787a2ce88bf6d0ce3cd8b6cf5314e80e7703cd41bf4af8cd2e2909dbd6b6d.png', 0, '0:0:0:0:0:0:0:1', '2024-04-29 21:50:32', 'admin', '2021-01-05 17:03:47', NULL, '2024-04-29 21:50:32', b'0', 1);
-INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (100, 'sso', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', '芋道', '不要吓我', 104, '[1]', 'sso@iocoder.cn', '15601691300', 1, '', 1, '127.0.0.1', '2022-07-09 23:03:33', '', '2021-01-07 09:07:17', NULL, '2022-07-09 23:03:33', b'0', 1);
+INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (100, 'sso', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', '中康科', '不要吓我', 104, '[1]', 'sso@iocoder.cn', '15601691300', 1, '', 1, '127.0.0.1', '2022-07-09 23:03:33', '', '2021-01-07 09:07:17', NULL, '2022-07-09 23:03:33', b'0', 1);
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (103, 'yuanma', '$2a$10$YMpimV4T6BtDhIaA8jSW.u8UTGBeGhc/qwXP4oxoMr4mOw9.qttt6', '源码', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, '', 0, '0:0:0:0:0:0:0:1', '2024-03-18 21:09:04', '', '2021-01-13 23:50:35', NULL, '2024-03-18 21:09:04', b'0', 1);
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (104, 'test', '$2a$04$KhExCYl7lx6eWWZYKsibKOZ8IBJRyuNuCcEOLQ11RYhJKgHmlSwK.', '测试号', NULL, 107, '[1,2]', '111@qq.com', '15601691200', 1, '', 0, '0:0:0:0:0:0:0:1', '2024-03-26 07:11:35', '', '2021-01-21 02:13:53', NULL, '2024-03-26 07:11:35', b'0', 1);
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (107, 'admin107', '$2a$10$dYOOBKMO93v/.ReCqzyFg.o67Tqk.bbc2bhrpyBGkIw9aypCtr2pm', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, '', 0, '', NULL, '1', '2022-02-20 22:59:33', '1', '2022-02-27 08:26:51', b'0', 118);
@@ -3757,7 +3757,7 @@ INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`,
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (110, 'admin110', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '小王', NULL, NULL, NULL, '', '15601691300', 0, '', 0, '127.0.0.1', '2022-09-25 22:47:33', '1', '2022-02-22 00:56:14', NULL, '2022-09-25 22:47:33', b'0', 121);
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (111, 'test', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '测试用户', NULL, NULL, '[]', '', '', 0, '', 0, '0:0:0:0:0:0:0:1', '2023-12-30 11:42:17', '110', '2022-02-23 13:14:33', NULL, '2023-12-30 11:42:17', b'0', 121);
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (112, 'newobject', '$2a$04$dB0z8Q819fJWz0hbaLe6B.VfHCjYgWx6LFfET5lyz3JwcqlyCkQ4C', '新对象', NULL, 100, '[]', '', '15601691235', 1, '', 0, '0:0:0:0:0:0:0:1', '2024-03-16 23:11:38', '1', '2022-02-23 19:08:03', NULL, '2024-03-16 23:11:38', b'0', 1);
-INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '芋道', NULL, NULL, NULL, '', '15601691300', 0, '', 0, '127.0.0.1', '2022-03-19 18:38:51', '1', '2022-03-07 21:37:58', NULL, '2022-03-19 18:38:51', b'0', 122);
+INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '中康科', NULL, NULL, NULL, '', '15601691300', 0, '', 0, '127.0.0.1', '2022-03-19 18:38:51', '1', '2022-03-07 21:37:58', NULL, '2022-03-19 18:38:51', b'0', 122);
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (114, 'hrmgr', '$2a$10$TR4eybBioGRhBmDBWkqWLO6NIh3mzYa8KBKDDB5woiGYFVlRAi.fu', 'hr 小姐姐', NULL, NULL, '[5]', '', '15601691236', 1, '', 0, '0:0:0:0:0:0:0:1', '2024-03-24 22:21:05', '1', '2022-03-19 21:50:58', NULL, '2024-03-24 22:21:05', b'0', 1);
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (115, 'aotemane', '$2a$04$GcyP0Vyzb2F2Yni5PuIK9ueGxM0tkZGMtDwVRwrNbtMvorzbpNsV2', '阿呆', '11222', 102, '[1,2]', '7648@qq.com', '15601691229', 2, '', 0, '', NULL, '1', '2022-04-30 02:55:43', '1', '2024-04-04 09:37:14', b'0', 1);
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (117, 'admin123', '$2a$10$WI8Gg/lpZQIrOEZMHqka7OdFaD4Nx.B/qY8ZGTTUKrOJwaHFqibaC', '测试号', '1111', 100, '[2]', '', '15601691234', 1, '', 0, '', NULL, '1', '2022-07-09 17:40:26', '1', '2022-07-09 17:40:26', b'0', 1);

sso-framework/sso-spring-boot-starter-security/src/main/java/com/poteviohealth/cgp/sso/framework/operatelog/core/service/LogRecordServiceImpl.java

@@ -57,7 +57,7 @@ public class LogRecordServiceImpl implements ILogRecordService {
         reqDTO.setType(logRecord.getType()); // 大模块类型，例如：CRM 客户
         reqDTO.setSubType(logRecord.getSubType());// 操作名称，例如：转移客户
         reqDTO.setBizId(Long.parseLong(logRecord.getBizNo())); // 业务编号，例如：客户编号
-        reqDTO.setAction(logRecord.getAction());// 操作内容，例如：修改编号为 1 的用户信息，将性别从男改成女，将姓名从芋道改成源码。
+        reqDTO.setAction(logRecord.getAction());// 操作内容，例如：修改编号为 1 的用户信息，将性别从男改成女，将姓名从中康科改成源码。
         reqDTO.setExtra(logRecord.getExtra()); // 拓展字段，有些复杂的业务，需要记录一些字段 ( JSON 格式 )，例如说，记录订单编号，{ orderId: "1"}
     }
 

sso-module-infra/sso-module-infra-biz/src/main/java/com/poteviohealth/cgp/sso/module/infra/controller/admin/codegen/CodegenController.java

@@ -51,7 +51,7 @@ public class CodegenController {
     @Parameters({
             @Parameter(name = "dataSourceConfigId", description = "数据源配置的编号", required = true, example = "1"),
             @Parameter(name = "name", description = "表名，模糊匹配", example = "sso"),
-            @Parameter(name = "comment", description = "描述，模糊匹配", example = "芋道")
+            @Parameter(name = "comment", description = "描述，模糊匹配", example = "中康科")
     })
     @PreAuthorize("@ss.hasPermission('infra:codegen:query')")
     public CommonResult<List<DatabaseTableRespVO>> getDatabaseTableList(

sso-module-infra/sso-module-infra-biz/src/main/java/com/poteviohealth/cgp/sso/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java

@@ -20,7 +20,7 @@ public class CodegenTablePageReqVO extends PageParam {
     @Schema(description = "表名称，模糊匹配", example = "sso")
     private String tableName;
 
-    @Schema(description = "表描述，模糊匹配", example = "芋道")
+    @Schema(description = "表描述，模糊匹配", example = "中康科")
     private String tableComment;
 
     @Schema(description = "实体，模糊匹配", example = "Sso")

sso-module-infra/sso-module-infra-biz/src/main/java/com/poteviohealth/cgp/sso/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java

@@ -18,7 +18,7 @@ public class CodegenTableRespVO {
     @Schema(description = "表名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "sso")
     private String tableName;
 
-    @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     private String tableComment;
 
     @Schema(description = "备注", example = "我是备注")

sso-module-infra/sso-module-infra-biz/src/main/java/com/poteviohealth/cgp/sso/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java

@@ -25,7 +25,7 @@ public class CodegenTableSaveReqVO {
     @NotNull(message = "表名称不能为空")
     private String tableName;
 
-    @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     @NotNull(message = "表描述不能为空")
     private String tableComment;
 

sso-module-system/sso-module-system-api/src/main/java/com/poteviohealth/cgp/sso/module/system/api/logger/dto/OperateLogCreateReqDTO.java

@@ -51,7 +51,7 @@ public class OperateLogCreateReqDTO {
     private Long bizId;
     /**
      * 操作内容，记录整个操作的明细
-     * 例如说，修改编号为 1 的用户信息，将性别从男改成女，将姓名从芋道改成源码。
+     * 例如说，修改编号为 1 的用户信息，将性别从男改成女，将姓名从中康科改成源码。
      */
     @NotEmpty(message = "操作内容不能为空")
     private String action;

sso-module-system/sso-module-system-api/src/main/java/com/poteviohealth/cgp/sso/module/system/enums/ErrorCodeConstants.java

@@ -194,4 +194,6 @@ public interface ErrorCodeConstants {
     // ========== 站内信发送 1-002-028-000 ==========
     ErrorCode NOTIFY_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1_002_028_000, "模板参数({})缺失");
 
+    ErrorCode SEQUENCE_NOT_EXISTS = new ErrorCode(1_002_029_000, "系统序列不存在");
+
 }

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/auth/vo/AuthMenuRespVO.java

@@ -15,13 +15,13 @@ import java.util.List;
 @Builder
 public class AuthMenuRespVO {
 
-    @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     private Long id;
 
     @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long parentId;
 
-    @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     private String name;
 
     @Schema(description = "路由地址,仅菜单类型为菜单或者目录时，才需要传", example = "post")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java

@@ -62,13 +62,13 @@ public class AuthPermissionInfoRespVO {
     @Builder
     public static class MenuVO {
 
-        @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+        @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
         private Long id;
 
         @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
         private Long parentId;
 
-        @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+        @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
         private String name;
 
         @Schema(description = "路由地址,仅菜单类型为菜单或者目录时，才需要传", example = "post")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java

@@ -7,7 +7,7 @@ import lombok.Data;
 @Data
 public class DeptListReqVO {
 
-    @Schema(description = "部门名称，模糊匹配", example = "芋道")
+    @Schema(description = "部门名称，模糊匹配", example = "中康科")
     private String name;
 
     @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/dept/vo/dept/DeptRespVO.java

@@ -1,9 +1,12 @@
 package com.poteviohealth.cgp.sso.module.system.controller.admin.dept.vo.dept;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.poteviohealth.cgp.sso.framework.mybatis.core.type.JsonLongSetTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Set;
 
 @Schema(description = "管理后台 - 部门信息 Response VO")
 @Data
@@ -12,7 +15,7 @@ public class DeptRespVO {
     @Schema(description = "部门编号", example = "1024")
     private Long id;
 
-    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     private String name;
 
     @Schema(description = "父部门 ID", example = "1024")
@@ -40,4 +43,56 @@ public class DeptRespVO {
     @Schema(description = "部门编码", example = "1")
     private String code;
 
+    @Schema(description = "所在地编号", example = "101010")
+    private Long areaId;
+
+    @Schema(description = "所在地全程", example = "北京北京市海淀区")
+    private String areaName;
+
+    @Schema(description = "详细地址描述", example = "北京北京市海淀市")
+    private String address;
+
+
+    @Schema(description = "原机构名称", example = "中康科")
+    private String originalName;
+
+    @Schema(description = "原机构编码", example = "ZKY0010001")
+    private String originalCode;
+
+    @Schema(description = "分公司名称", example = "中康养")
+    private String companyName;
+
+    @Schema(description = "机构别名", example = "中康科别名")
+    private String aliasName;
+
+    @Schema(description = "机构别名2", example = "中康科别名2")
+    private String aliasNameOther;
+
+    @Schema(description = "已上系统", example = "[机构系统,旅居系统]")
+    @TableField(typeHandler = JsonLongSetTypeHandler.class)
+    private Set<Long> applySystems;
+
+    @Schema(description = "品牌", example = "[南山有约,萱悦庭]")
+    @TableField(typeHandler = JsonLongSetTypeHandler.class)
+    private Set<Long> brand;
+
+    @Schema(description = "机构性质", example = "[机构,旅居]")
+    @TableField(typeHandler = JsonLongSetTypeHandler.class)
+    private Set<Long> propertypes;
+
+    @Schema(description = "经营方式", example = " 0")
+    private Integer businessPattern;
+
+    @Schema(description = "经营状态", example = "0")
+    private Integer businessStatus;
+
+    @Schema(description = "创立时间", example = "0")
+    private LocalDateTime establishTime;
+
+    @Schema(description = "是否支持BI", example = "0")
+    private Integer supportBi;
+
+    @Schema(description = "附加信息", example = "中康科")
+    private String remark;
+
 }

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java

@@ -1,7 +1,9 @@
 package com.poteviohealth.cgp.sso.module.system.controller.admin.dept.vo.dept;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.poteviohealth.cgp.sso.framework.common.enums.CommonStatusEnum;
 import com.poteviohealth.cgp.sso.framework.common.validation.InEnum;
+import com.poteviohealth.cgp.sso.framework.mybatis.core.type.JsonLongSetTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -9,6 +11,8 @@ import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
+import java.util.Set;
 
 @Schema(description = "管理后台 - 部门创建/修改 Request VO")
 @Data
@@ -17,7 +21,7 @@ public class DeptSaveReqVO {
     @Schema(description = "部门编号", example = "1024")
     private Long id;
 
-    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     @NotBlank(message = "部门名称不能为空")
     @Size(max = 30, message = "部门名称长度不能超过 30 个字符")
     private String name;
@@ -26,7 +30,7 @@ public class DeptSaveReqVO {
     private Long parentId;
 
     @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotNull(message = "显示顺序不能为空")
+//    @NotNull(message = "显示顺序不能为空")
     private Integer sort;
 
     @Schema(description = "负责人的用户编号", example = "2048")
@@ -55,4 +59,56 @@ public class DeptSaveReqVO {
     @Schema(description = "部门编码", example = "1")
     private String code;
 
+    @Schema(description = "所在地编号", example = "101010")
+    private Long areaId;
+
+    @Schema(description = "所在地描述", example = "北京北京市海淀市")
+    private String areaName;
+
+    @Schema(description = "详细地址描述", example = "北京北京市海淀市")
+    private String address;
+
+
+    @Schema(description = "原机构名称", example = "中康科")
+    private String originalName;
+
+    @Schema(description = "原机构编码", example = "ZKY0010001")
+    private String originalCode;
+
+    @Schema(description = "分公司名称", example = "中康养")
+    private String companyName;
+
+    @Schema(description = "机构别名", example = "中康科别名")
+    private String aliasName;
+
+    @Schema(description = "机构别名2", example = "中康科别名2")
+    private String aliasNameOther;
+
+    @Schema(description = "已上系统", example = "[机构系统,旅居系统]")
+    @TableField(typeHandler = JsonLongSetTypeHandler.class)
+    private Set<Long> applySystems;
+
+    @Schema(description = "品牌", example = "[南山有约,萱悦庭]")
+    @TableField(typeHandler = JsonLongSetTypeHandler.class)
+    private Set<Long> brand;
+
+    @Schema(description = "机构性质", example = "[机构,旅居]")
+    @TableField(typeHandler = JsonLongSetTypeHandler.class)
+    private Set<Long> propertypes;
+
+    @Schema(description = "经营方式", example = " 0")
+    private Integer businessPattern;
+
+    @Schema(description = "经营状态", example = "0")
+    private Integer businessStatus;
+
+    @Schema(description = "创立时间", example = "0")
+    private LocalDateTime establishTime;
+
+    @Schema(description = "是否支持BI", example = "0")
+    private Integer supportBi;
+
+    @Schema(description = "附加信息", example = "中康科")
+    private String remark;
+
 }

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java

@@ -1,10 +1,15 @@
 package com.poteviohealth.cgp.sso.module.system.controller.admin.dept.vo.dept;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.poteviohealth.cgp.sso.framework.mybatis.core.type.JsonLongSetTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
+import java.util.Set;
+
 @Schema(description = "管理后台 - 部门精简信息 Response VO")
 @Data
 @NoArgsConstructor
@@ -14,7 +19,7 @@ public class DeptSimpleRespVO {
     @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     private String name;
 
     @Schema(description = "父部门 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@@ -26,8 +31,59 @@ public class DeptSimpleRespVO {
     @Schema(description = "部门路径", example = "1")
     private String treePath;
 
-
     @Schema(description = "部门编码", example = "1")
     private String code;
 
+    @Schema(description = "所在地编号", example = "101010")
+    private Long areaId;
+
+    @Schema(description = "所在地描述", example = "北京北京市海淀市")
+    private String areaName;
+
+    @Schema(description = "详细地址描述", example = "北京北京市海淀市")
+    private String address;
+
+
+    @Schema(description = "原机构名称", example = "中康科")
+    private String originalName;
+
+    @Schema(description = "原机构编码", example = "ZKY0010001")
+    private String originalCode;
+
+    @Schema(description = "分公司名称", example = "中康养")
+    private String companyName;
+
+    @Schema(description = "机构别名", example = "中康科别名")
+    private String aliasName;
+
+    @Schema(description = "机构别名2", example = "中康科别名2")
+    private String aliasNameOther;
+
+    @Schema(description = "已上系统", example = "[机构系统,旅居系统]")
+    @TableField(typeHandler = JsonLongSetTypeHandler.class)
+    private Set<Long> applySystems;
+
+    @Schema(description = "品牌", example = "[南山有约,萱悦庭]")
+    @TableField(typeHandler = JsonLongSetTypeHandler.class)
+    private Set<Long> brand;
+
+    @Schema(description = "机构性质", example = "[机构,旅居]")
+    @TableField(typeHandler = JsonLongSetTypeHandler.class)
+    private Set<Long> propertypes;
+
+    @Schema(description = "经营方式", example = " 0")
+    private Integer businessPattern;
+
+    @Schema(description = "经营状态", example = "0")
+    private Integer businessStatus;
+
+    @Schema(description = "创立时间", example = "0")
+    private LocalDateTime establishTime;
+
+    @Schema(description = "是否支持BI", example = "0")
+    private Integer supportBi;
+
+    @Schema(description = "附加信息", example = "中康科")
+    private String remark;
+
 }

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/dept/vo/post/PostPageReqVO.java

@@ -13,7 +13,7 @@ public class PostPageReqVO extends PageParam {
     @Schema(description = "岗位编码，模糊匹配", example = "sso")
     private String code;
 
-    @Schema(description = "岗位名称，模糊匹配", example = "芋道")
+    @Schema(description = "岗位名称，模糊匹配", example = "中康科")
     private String name;
 
     @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java

@@ -14,7 +14,7 @@ import javax.validation.constraints.Size;
 @EqualsAndHashCode(callSuper = true)
 public class DictDataPageReqVO extends PageParam {
 
-    @Schema(description = "字典标签", example = "芋道")
+    @Schema(description = "字典标签", example = "中康科")
     @Size(max = 100, message = "字典标签长度不能超过100个字符")
     private String label;
 

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/dict/vo/data/DictDataRespVO.java

@@ -23,7 +23,7 @@ public class DictDataRespVO {
     @ExcelProperty("字典排序")
     private Integer sort;
 
-    @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     @ExcelProperty("字典标签")
     private String label;
 

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java

@@ -20,7 +20,7 @@ public class DictDataSaveReqVO {
     @NotNull(message = "显示顺序不能为空")
     private Integer sort;
 
-    @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     @NotBlank(message = "字典标签不能为空")
     @Size(max = 100, message = "字典标签长度不能超过100个字符")
     private String label;

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java

@@ -16,7 +16,7 @@ import static com.poteviohealth.cgp.sso.framework.common.util.date.DateUtils.FOR
 @EqualsAndHashCode(callSuper = true)
 public class DictTypePageReqVO extends PageParam {
 
-    @Schema(description = "字典类型名称，模糊匹配", example = "芋道")
+    @Schema(description = "字典类型名称，模糊匹配", example = "中康科")
     private String name;
 
     @Schema(description = "字典类型，模糊匹配", example = "sys_common_sex")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java

@@ -10,7 +10,7 @@ public class DictTypeSimpleRespVO {
     @Schema(description = "字典类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "字典类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "字典类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     private String name;
 
     @Schema(description = "字典类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "sys_common_sex")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java

@@ -18,7 +18,7 @@ public class LoginLogPageReqVO extends PageParam {
     @Schema(description = "用户 IP，模拟匹配", example = "127.0.0.1")
     private String userIp;
 
-    @Schema(description = "用户账号，模拟匹配", example = "芋道")
+    @Schema(description = "用户账号，模拟匹配", example = "中康科")
     private String username;
 
     @Schema(description = "操作状态", example = "true")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java

@@ -13,7 +13,7 @@ import static com.poteviohealth.cgp.sso.framework.common.util.date.DateUtils.FOR
 @Data
 public class OperateLogPageReqVO extends PageParam {
 
-    @Schema(description = "用户编号", example = "芋道")
+    @Schema(description = "用户编号", example = "中康科")
     private Long userId;
 
     @Schema(description = "操作模块业务编号", example = "1")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java

@@ -43,7 +43,7 @@ public class OperateLogRespVO implements VO {
     @ExcelProperty("操作模块业务编号")
     private Long bizId;
 
-    @Schema(description = "操作明细", example = "修改编号为 1 的用户信息，将性别从男改成女，将姓名从芋道改成源码。")
+    @Schema(description = "操作明细", example = "修改编号为 1 的用户信息，将性别从男改成女，将姓名从中康科改成源码。")
     private String action;
 
     @Schema(description = "拓展字段", example = "{'orderId': 1}")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/notice/vo/NoticePageReqVO.java

@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class NoticePageReqVO extends PageParam {
 
-    @Schema(description = "通知公告名称，模糊匹配", example = "芋道")
+    @Schema(description = "通知公告名称，模糊匹配", example = "中康科")
     private String title;
 
     @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/oauth2/OAuth2OpenController.java

@@ -140,7 +140,7 @@ public class OAuth2OpenController {
         return success(OAuth2OpenConvert.INSTANCE.convert(accessTokenDO));
     }
 
-    @PostMapping("/standard/token")
+    @PostMapping("/standard-token")
     @PermitAll
     @Operation(summary = "获得访问令牌", description = "适合 code 授权码模式，或者 implicit 简化模式；在 sso.vue 单点登录界面被【获取】调用")
     @Parameters({

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java

@@ -19,7 +19,7 @@ public class OAuth2UserInfoRespVO {
     @Schema(description = "用户账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
     private String username;
 
-    @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     private String nickname;
 
     @Schema(description = "用户邮箱", example = "sso@iocoder.cn")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java

@@ -7,7 +7,7 @@ import lombok.Data;
 @Data
 public class MenuListReqVO {
 
-    @Schema(description = "菜单名称，模糊匹配", example = "芋道")
+    @Schema(description = "菜单名称，模糊匹配", example = "中康科")
     private String name;
 
     @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/permission/vo/menu/MenuRespVO.java

@@ -18,7 +18,7 @@ public class MenuRespVO {
     @Schema(description = "菜单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     @NotBlank(message = "菜单名称不能为空")
     @Size(max = 50, message = "菜单名称长度不能超过50个字符")
     private String name;

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java

@@ -14,7 +14,7 @@ public class MenuSaveVO {
     @Schema(description = "菜单编号", example = "1024")
     private Long id;
 
-    @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     @NotBlank(message = "菜单名称不能为空")
     @Size(max = 50, message = "菜单名称长度不能超过50个字符")
     private String name;

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java

@@ -14,7 +14,7 @@ public class MenuSimpleRespVO {
     @Schema(description = "菜单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     private String name;
 
     @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/permission/vo/role/RolePageReqVO.java

@@ -15,7 +15,7 @@ import static com.poteviohealth.cgp.sso.framework.common.util.date.DateUtils.FOR
 @EqualsAndHashCode(callSuper = true)
 public class RolePageReqVO extends PageParam {
 
-    @Schema(description = "角色名称，模糊匹配", example = "芋道")
+    @Schema(description = "角色名称，模糊匹配", example = "中康科")
     private String name;
 
     @Schema(description = "角色标识，模糊匹配", example = "sso")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java

@@ -12,7 +12,7 @@ public class RoleSimpleRespVO {
     @Schema(description = "角色编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "角色名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "角色名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     private String name;
 
 }

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/sequence/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * 提供 RESTful API 给前端：
+ * 1. admin 包：提供给管理后台 sso-ui-admin 前端项目
+ * 2. app 包：提供给用户 APP sso-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分
+ */
+package com.poteviohealth.cgp.sso.module.system.controller.admin.sequence;

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/sequence/vo/SequencePageReqVO.java

@@ -0,0 +1,27 @@
+package com.poteviohealth.cgp.sso.module.system.controller.admin.sequence.vo;
+
+import com.poteviohealth.cgp.sso.framework.common.pojo.PageParam;
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+@Schema(description = "管理后台 - 系统序列分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class SequencePageReqVO extends PageParam {
+
+    @Schema(description = "名称", example = "芋艿")
+    private String name;
+
+    @Schema(description = "类型描述", example = "2")
+    private String type;
+
+    @Schema(description = "当前值")
+    private Integer currentValue;
+
+    @Schema(description = "步进")
+    private Integer increment;
+
+}

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/sequence/vo/SequenceRespVO.java

@@ -0,0 +1,33 @@
+package com.poteviohealth.cgp.sso.module.system.controller.admin.sequence.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 系统序列 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class SequenceRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25461")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @ExcelProperty("名称")
+    private String name;
+
+    @Schema(description = "类型描述", example = "2")
+    @ExcelProperty("类型描述")
+    private String type;
+
+    @Schema(description = "当前值", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("当前值")
+    private Integer currentValue;
+
+    @Schema(description = "步进", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("步进")
+    private Integer increment;
+
+}

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/sequence/vo/SequenceSaveReqVO.java

@@ -0,0 +1,30 @@
+package com.poteviohealth.cgp.sso.module.system.controller.admin.sequence.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 系统序列新增/修改 Request VO")
+@Data
+public class SequenceSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25461")
+    private Long id;
+
+    @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @NotEmpty(message = "名称不能为空")
+    private String name;
+
+    @Schema(description = "类型描述", example = "2")
+    private String type;
+
+    @Schema(description = "当前值", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "当前值不能为空")
+    private Integer currentValue;
+
+    @Schema(description = "步进", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "步进不能为空")
+    private Integer increment;
+
+}

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/tenant/TenantController.http

@@ -8,7 +8,7 @@ Authorization: Bearer {{token}}
 tenant-id: {{adminTenentId}}
 
 {
-  "name": "芋道",
+  "name": "中康科",
   "contactName": "芋艿",
   "contactMobile": "15601691300",
   "status": 0,

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java

@@ -17,7 +17,7 @@ import static com.poteviohealth.cgp.sso.framework.common.util.date.DateUtils.FOR
 @ToString(callSuper = true)
 public class TenantPageReqVO extends PageParam {
 
-    @Schema(description = "租户名", example = "芋道")
+    @Schema(description = "租户名", example = "中康科")
     private String name;
 
     @Schema(description = "联系人", example = "芋艿")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java

@@ -19,7 +19,7 @@ public class TenantRespVO {
     @ExcelProperty("租户编号")
     private Long id;
 
-    @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     @ExcelProperty("租户名")
     private String name;
 

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java

@@ -19,7 +19,7 @@ public class TenantSaveReqVO {
     @Schema(description = "租户编号", example = "1024")
     private Long id;
 
-    @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     @NotNull(message = "租户名不能为空")
     private String name;
 

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/tenant/vo/tenant/TenantSimpleRespVO.java

@@ -10,7 +10,7 @@ public class TenantSimpleRespVO {
     @Schema(description = "租户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     private String name;
 
 }

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/user/UserController.java

@@ -232,7 +232,7 @@ public class UserController {
         // 手动创建导出 demo
         List<UserImportExcelVO> list = Arrays.asList(
                 UserImportExcelVO.builder().username("yunai").deptId(1L).email("yunai@iocoder.cn").mobile("15601691300")
-                        .nickname("芋道").status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(),
+                        .nickname("中康科").status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(),
                 UserImportExcelVO.builder().username("yuanma").deptId(2L).email("yuanma@iocoder.cn").mobile("15601701300")
                         .nickname("源码").status(CommonStatusEnum.DISABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
         );

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java

@@ -18,7 +18,7 @@ public class UserSimpleRespVO {
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     private String nickname;
 
     @Schema(description = "部门ID", example = "我是一个用户")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/controller/app/dict/vo/AppDictDataRespVO.java

@@ -17,7 +17,7 @@ public class AppDictDataRespVO {
     @Schema(description = "字典数据编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "中康科")
     private String label;
 
     @Schema(description = "字典值", requiredMode = Schema.RequiredMode.REQUIRED, example = "iocoder")

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/dal/dataobject/dept/DeptDO.java

@@ -1,6 +1,8 @@
 package com.poteviohealth.cgp.sso.module.system.dal.dataobject.dept;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.poteviohealth.cgp.sso.framework.common.enums.CommonStatusEnum;
+import com.poteviohealth.cgp.sso.framework.mybatis.core.type.JsonLongSetTypeHandler;
 import com.poteviohealth.cgp.sso.framework.tenant.core.db.TenantBaseDO;
 import com.poteviohealth.cgp.sso.module.system.dal.dataobject.user.AdminUserDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
@@ -10,6 +12,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDateTime;
+import java.util.Set;
+
 /**
  * 部门表
  *
@@ -70,6 +75,58 @@ public class DeptDO extends TenantBaseDO {
     @Schema(description = "部门路径", example = "1")
     private String treePath;
 
+    @Schema(description = "部门编码", example = "1")
     private String code;
 
+    @Schema(description = "所在地编号", example = "101010")
+    private Long areaId;
+
+    @Schema(description = "所在地描述", example = "北京北京市海淀市")
+    private String areaName;
+
+    @Schema(description = "详细地址描述", example = "北京北京市海淀市")
+    private String address;
+
+
+    @Schema(description = "原机构名称", example = "中康科")
+    private String originalName;
+
+    @Schema(description = "原机构编码", example = "ZKY0010001")
+    private String originalCode;
+
+    @Schema(description = "分公司名称", example = "中康养")
+    private String companyName;
+
+    @Schema(description = "机构别名", example = "中康科别名")
+    private String aliasName;
+
+    @Schema(description = "机构别名2", example = "中康科别名2")
+    private String aliasNameOther;
+
+    @Schema(description = "已上系统", example = "[机构系统,旅居系统]")
+    @TableField(typeHandler = JsonLongSetTypeHandler.class)
+    private Set<Long> applySystems;
+
+    @Schema(description = "品牌", example = "[南山有约,萱悦庭]")
+    @TableField(typeHandler = JsonLongSetTypeHandler.class)
+    private Set<Long> brand;
+
+    @Schema(description = "机构性质", example = "[机构,旅居]")
+    @TableField(typeHandler = JsonLongSetTypeHandler.class)
+    private Set<Long> propertypes;
+
+    @Schema(description = "经营方式", example = " 0")
+    private Integer businessPattern;
+
+    @Schema(description = "经营状态", example = "0")
+    private Integer businessStatus;
+
+    @Schema(description = "创立时间", example = "0")
+    private LocalDateTime establishTime;
+
+    @Schema(description = "是否支持BI", example = "0")
+    private Integer supportBi;
+
+    @Schema(description = "附加信息", example = "中康科")
+    private String remark;
 }

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/dal/dataobject/logger/OperateLogDO.java

@@ -55,7 +55,7 @@ public class OperateLogDO extends BaseDO {
     /**
      * 日志内容，记录整个操作的明细
      *
-     * 例如说，修改编号为 1 的用户信息，将性别从男改成女，将姓名从芋道改成源码。
+     * 例如说，修改编号为 1 的用户信息，将性别从男改成女，将姓名从中康科改成源码。
      */
     private String action;
     /**

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/dal/dataobject/sequence/SequenceDO.java

@@ -0,0 +1,46 @@
+package com.poteviohealth.cgp.sso.module.system.dal.dataobject.sequence;
+
+import com.poteviohealth.cgp.sso.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
+import java.util.*;
+import com.baomidou.mybatisplus.annotation.*;
+
+
+/**
+ * 系统序列 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("system_sequence")
+@KeySequence("system_sequence_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SequenceDO extends BaseDO {
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 类型描述
+     */
+    private String type;
+    /**
+     * 当前值
+     */
+    private Integer currentValue;
+    /**
+     * 步进
+     */
+    private Integer increment;
+
+}

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/dal/mysql/sequence/SequenceMapper.java

@@ -0,0 +1,31 @@
+package com.poteviohealth.cgp.sso.module.system.dal.mysql.sequence;
+
+import java.util.*;
+
+
+import com.poteviohealth.cgp.sso.framework.common.pojo.PageResult;
+import com.poteviohealth.cgp.sso.framework.mybatis.core.mapper.BaseMapperX;
+import com.poteviohealth.cgp.sso.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.poteviohealth.cgp.sso.module.system.controller.admin.sequence.vo.SequencePageReqVO;
+import com.poteviohealth.cgp.sso.module.system.dal.dataobject.sequence.SequenceDO;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * 系统序列 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface SequenceMapper extends BaseMapperX<SequenceDO> {
+
+    default PageResult<SequenceDO> selectPage(SequencePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<SequenceDO>()
+                .likeIfPresent(SequenceDO::getName, reqVO.getName())
+                .eqIfPresent(SequenceDO::getType, reqVO.getType())
+                .eqIfPresent(SequenceDO::getCurrentValue, reqVO.getCurrentValue())
+                .eqIfPresent(SequenceDO::getIncrement, reqVO.getIncrement())
+                .orderByDesc(SequenceDO::getId));
+    }
+
+}

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/service/dept/DeptServiceImpl.java

@@ -65,6 +65,8 @@ public class DeptServiceImpl implements DeptService {
             }
             createReqVO.setLevel(parentDept.getLevel()+1);
             createReqVO.setTreePath(StringUtils.isNotEmpty(parentDept.getTreePath())?parentDept.getTreePath()+","+parentDept.getId():String.valueOf(parentDept.getId()));
+        }else{
+            createReqVO.setLevel(1);
         }
         // 插入部门
         DeptDO dept = BeanUtils.toBean(createReqVO, DeptDO.class);

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/service/oauth2/OAuth2GrantServiceImpl.java

@@ -59,10 +59,12 @@ public class OAuth2GrantServiceImpl implements OAuth2GrantService {
             throw exception(ErrorCodeConstants.OAUTH2_GRANT_REDIRECT_URI_MISMATCH);
         }
         // 校验 state 是否匹配
+        System.out.println("####################state:"+state);
+        System.out.println("####################codeDO.getState():"+codeDO.getState());
         state = StrUtil.nullToDefault(state, ""); // 数据库 state 为 null 时，会设置为 "" 空串
-        if (!StrUtil.equals(state, codeDO.getState())) {
-            throw exception(ErrorCodeConstants.OAUTH2_GRANT_STATE_MISMATCH);
-        }
+//        if (!StrUtil.equals(state, codeDO.getState())) {
+//            throw exception(ErrorCodeConstants.OAUTH2_GRANT_STATE_MISMATCH);
+//        }
 
         // 创建访问令牌
         return oauth2TokenService.createAccessToken(codeDO.getUserId(), codeDO.getUserType(),

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/service/sequence/SequenceService.java

@@ -0,0 +1,57 @@
+package com.poteviohealth.cgp.sso.module.system.service.sequence;
+
+import com.poteviohealth.cgp.sso.framework.common.pojo.PageResult;
+import com.poteviohealth.cgp.sso.module.system.controller.admin.sequence.vo.SequencePageReqVO;
+import com.poteviohealth.cgp.sso.module.system.controller.admin.sequence.vo.SequenceSaveReqVO;
+import com.poteviohealth.cgp.sso.module.system.dal.dataobject.sequence.SequenceDO;
+
+import java.util.*;
+import javax.validation.*;
+
+
+/**
+ * 系统序列 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface SequenceService {
+
+    /**
+     * 创建系统序列
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createSequence(@Valid SequenceSaveReqVO createReqVO);
+
+    /**
+     * 更新系统序列
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateSequence(@Valid SequenceSaveReqVO updateReqVO);
+
+    /**
+     * 删除系统序列
+     *
+     * @param id 编号
+     */
+    void deleteSequence(Long id);
+
+    /**
+     * 获得系统序列
+     *
+     * @param id 编号
+     * @return 系统序列
+     */
+    SequenceDO getSequence(Long id);
+
+    /**
+     * 获得系统序列分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 系统序列分页
+     */
+    PageResult<SequenceDO> getSequencePage(SequencePageReqVO pageReqVO);
+
+}

sso-module-system/sso-module-system-biz/src/main/java/com/poteviohealth/cgp/sso/module/system/service/sequence/SequenceServiceImpl.java

@@ -0,0 +1,74 @@
+package com.poteviohealth.cgp.sso.module.system.service.sequence;
+
+import com.poteviohealth.cgp.sso.framework.common.pojo.PageResult;
+import com.poteviohealth.cgp.sso.framework.common.util.object.BeanUtils;
+import com.poteviohealth.cgp.sso.module.system.controller.admin.sequence.vo.SequencePageReqVO;
+import com.poteviohealth.cgp.sso.module.system.controller.admin.sequence.vo.SequenceSaveReqVO;
+import com.poteviohealth.cgp.sso.module.system.dal.dataobject.sequence.SequenceDO;
+import com.poteviohealth.cgp.sso.module.system.dal.mysql.sequence.SequenceMapper;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+import static com.poteviohealth.cgp.sso.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.poteviohealth.cgp.sso.module.system.enums.ErrorCodeConstants.SEQUENCE_NOT_EXISTS;
+
+
+/**
+ * 系统序列 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class SequenceServiceImpl implements SequenceService {
+
+    @Resource
+    private SequenceMapper sequenceMapper;
+
+    @Override
+    public Long createSequence(SequenceSaveReqVO createReqVO) {
+        // 插入
+        SequenceDO sequence = BeanUtils.toBean(createReqVO, SequenceDO.class);
+        sequenceMapper.insert(sequence);
+        // 返回
+        return sequence.getId();
+    }
+
+    @Override
+    public void updateSequence(SequenceSaveReqVO updateReqVO) {
+        // 校验存在
+        validateSequenceExists(updateReqVO.getId());
+        // 更新
+        SequenceDO updateObj = BeanUtils.toBean(updateReqVO, SequenceDO.class);
+        sequenceMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteSequence(Long id) {
+        // 校验存在
+        validateSequenceExists(id);
+        // 删除
+        sequenceMapper.deleteById(id);
+    }
+
+    private void validateSequenceExists(Long id) {
+        if (sequenceMapper.selectById(id) == null) {
+            throw exception(SEQUENCE_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public SequenceDO getSequence(Long id) {
+        return sequenceMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<SequenceDO> getSequencePage(SequencePageReqVO pageReqVO) {
+        return sequenceMapper.selectPage(pageReqVO);
+    }
+
+}

sso-module-system/sso-module-system-biz/src/main/resources/mapper/sequence/SequenceMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.poteviohealth.cgp.sso.module.system.dal.mysql.sequence.SequenceMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+     -->
+
+</mapper>

sso-server/src/main/resources/application-dev.yaml

@@ -164,9 +164,9 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
       key-prefix: wa # Redis Key 的前缀
       http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
 
---- #################### 芋道相关配置 ####################
+--- #################### 中康科相关配置 ####################
 
-# 芋道配置项，设置当前项目所有自定义的配置
+# 中康科配置项，设置当前项目所有自定义的配置
 sso:
   xss:
     enable: false

sso-server/src/main/resources/application-local.yaml

@@ -67,10 +67,10 @@ spring:
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优R
   redis:
-    host: 8.131.243.90 # 地址
-    port: 6379 # 端口
+    host: 47.94.156.179 # 地址
+    port: 16379 # 端口
     database: 11 # 数据库索引
-    password: lzTest2022 # 密码，建议生产环境开启
+    password: trJQ#4gN # 密码，建议生产环境开启
 
 --- #################### 定时任务相关配置 ####################
 
@@ -201,9 +201,9 @@ wx:
       key-prefix: wa # Redis Key 的前缀
       http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
 
---- #################### 芋道相关配置 ####################
+--- #################### 中康科相关配置 ####################
 
-# 芋道配置项，设置当前项目所有自定义的配置
+# 中康科配置项，设置当前项目所有自定义的配置
 yudao:
   captcha:
     enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试；

sso-server/src/main/resources/application.yaml

@@ -142,7 +142,7 @@ spring:
     listener:
       missing-topics-fatal: false # 消费监听接口监听的主题不存在时，默认会报错。所以通过设置为 false ，解决报错
 
---- #################### 芋道相关配置 ####################
+--- #################### 中康科相关配置 ####################
 
 sso:
   info:
@@ -154,7 +154,6 @@ sso:
   security:
     permit-all_urls:
       - /admin-api/mp/open/** # 微信公众号开放平台，微信回调接口，不需要登录
-      -
   websocket:
     enable: true # websocket的开关
     path: /infra/ws # 路径

sso-ui/sso-ui-admin-vue3/src/views/Login/Login3.vue

@@ -20,10 +20,10 @@
             tag="div"
           >
             <img key="1" alt="" class="w-600px" src="@/assets/svgs/login-box-bg.svg" />
-            <div key="2" class="text-3xl">{{ t('login.welcome') }}</div>
-            <div key="3" class="mt-5 text-14px font-normal">
-              {{ t('login.message') }}
-            </div>
+<!--            <div key="2" class="text-3xl">{{ t('login.welcome') }}</div>-->
+<!--            <div key="3" class="mt-5 text-14px font-normal">-->
+<!--              {{ t('login.message') }}-->
+<!--            </div>-->
           </TransitionGroup>
         </div>
       </div>

sso-ui/sso-ui-admin-vue3/src/views/system/dept/DeptForm.vue

@@ -1,11 +1,11 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle">
+  <Dialog v-model="dialogVisible" max-height="620px" :title="dialogTitle" scroll>
     <el-form
       ref="formRef"
       v-loading="formLoading"
       :model="formData"
       :rules="formRules"
-      label-width="80px"
+      label-width="100px"
     >
       <el-form-item label="上级机构" prop="parentId">
         <el-tree-select
@@ -21,27 +21,94 @@
       <el-form-item label="机构名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入机构名称" maxlength="60" />
       </el-form-item>
-      <el-form-item label="机构编码" prop="code">
+      <el-form-item label="原机构名称"  prop="originalName" >
+        <el-input v-model="formData.originalName" placeholder="请输入原机构名称" maxlength="60" />
+      </el-form-item>
+      <el-form-item label="机构编码"  prop="code" >
         <el-input v-model="formData.code" placeholder="请输入编码" maxlength="30" />
       </el-form-item>
-      <el-form-item label="显示排序" prop="sort">
-        <el-input-number v-model="formData.sort" :min="0" controls-position="right" />
+      <el-form-item label="原机构编码"  prop="originalCode" >
+        <el-input v-model="formData.originalCode" placeholder="请输入原机构编码" maxlength="30" />
+      </el-form-item>
+      <el-form-item label="所在地" prop="areaId">
+        <el-tree-select
+          v-model="formData.areaId"
+          :data="areaList"
+          :props="customerProps"
+          :render-after-expand="true"
+        />
+      </el-form-item>
+      <el-form-item label="详细地址"  prop="address" >
+        <el-input v-model="formData.address" placeholder="请输入详细地址" maxlength="100" />
+      </el-form-item>
+      <el-form-item label="机构别名"  prop="aliasName" >
+        <el-input v-model="formData.aliasName" placeholder="请输入机构别名" maxlength="30" />
+      </el-form-item>
+      <el-form-item label="机构其他别名"  prop="aliasName" >
+        <el-input v-model="formData.aliasNameOther" placeholder="请输入机构别名" maxlength="30" />
+      </el-form-item>
+      <el-form-item label="原机构编码"  prop="originalCode" >
+        <el-input v-model="formData.originalCode" placeholder="请输入原机构编码" maxlength="30" />
+      </el-form-item>
+      <el-form-item label="品牌名称" prop="brand">
+        <el-select v-model="formData.brand" clearable placeholder="请选择品牌名称">
+          <el-option
+            v-for="dict in brandOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="机构性质" prop="propertypes">
+        <el-select v-model="formData.propertypes" clearable placeholder="请选择机构性质">
+          <el-option
+            v-for="dict in propertypesOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="已上系统" prop="applySystems">
+        <el-select v-model="formData.applySystems" clearable placeholder="请选择已上系统">
+          <el-option
+            v-for="dict in applySystemOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="负责人" prop="leaderUserId">
-        <el-select v-model="formData.leaderUserId" clearable placeholder="请输入负责人">
+      <el-form-item label="经营方式" prop="businessPattern">
+        <el-select v-model="formData.businessPattern" clearable placeholder="请选择状态">
           <el-option
-            v-for="item in userList"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
+            v-for="dict in businessPatternOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="联系电话" prop="phone">
-        <el-input v-model="formData.phone" maxlength="11" placeholder="请输入联系电话"  />
+      <el-form-item label="营业状态" prop="businessStatus">
+        <el-select v-model="formData.businessStatus" clearable placeholder="请选择状态">
+          <el-option
+            v-for="dict in businessStatusOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="邮箱" prop="email">
-        <el-input v-model="formData.email" maxlength="50" placeholder="请输入邮箱" />
+      <el-form-item label="支持BI" prop="supportBi">
+        <el-select v-model="formData.supportBi" clearable placeholder="请选择状态">
+          <el-option
+            v-for="dict in supportBiOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="formData.status" clearable placeholder="请选择状态">
@@ -53,6 +120,27 @@
           />
         </el-select>
       </el-form-item>
+
+
+<!--      <el-form-item label="显示排序" prop="sort">-->
+<!--        <el-input-number v-model="formData.sort" :min="0" controls-position="right" />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="负责人" prop="leaderUserId">-->
+<!--        <el-select v-model="formData.leaderUserId" clearable placeholder="请输入负责人">-->
+<!--          <el-option-->
+<!--            v-for="item in userList"-->
+<!--            :key="item.id"-->
+<!--            :label="item.nickname"-->
+<!--            :value="item.id"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="联系电话" prop="phone">-->
+<!--        <el-input v-model="formData.phone" maxlength="11" placeholder="请输入联系电话"  />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="邮箱" prop="email">-->
+<!--        <el-input v-model="formData.email" maxlength="50" placeholder="请输入邮箱" />-->
+<!--      </el-form-item>-->
     </el-form>
     <template #footer>
       <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -65,6 +153,7 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
+import * as AreaApi from '@/api/system/area'
 import { CommonStatusEnum } from '@/utils/constants'
 import { FormRules } from 'element-plus'
 
@@ -72,6 +161,7 @@ defineOptions({ name: 'SystemDeptForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
+const areaList = ref([]) // 地区列表
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
@@ -94,6 +184,10 @@ const formRules = reactive<FormRules>({
   name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
   code: [{ required: true, message: '部门编码不能为空', trigger: 'blur' }],
   sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
+  areaId: [{ required: true, message: '所在地不能为空', trigger: 'blur' }],
+  supportBi: [{ required: true, message: 'BI支持不能为空', trigger: 'blur' }],
+  businessStatus: [{ required: true, message: '营业状态不能为空', trigger: 'blur' }],
+  businessPattern: [{ required: true, message: '经营方式不能为空', trigger: 'blur' }],
   email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
   phone: [
     { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }
@@ -121,6 +215,8 @@ const open = async (type: string, id?: number) => {
   }
   // 获得用户列表
   userList.value = await UserApi.getSimpleUserList()
+  // 获得地区列表
+  areaList.value = await AreaApi.getAreaTree()
   // 获得部门树
   await getTree()
 }
@@ -177,4 +273,90 @@ const getTree = async () => {
   dept.children = handleTree(data)
   deptTree.value.push(dept)
 }
+
+const customerProps = {
+  children: 'children',
+  label: 'name',
+  value: 'id',
+  isLeaf: 'leaf',
+  emitPath: false // 用于 cascader 组件：在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
+}
+const brandOptions = [
+  {
+    value: 1,
+    label: '恒颐汇',
+  },
+  {
+    value: 2,
+    label: '楠山有约',
+  },
+  {
+    value: 3,
+    label: '恒颐汇',
+  }
+]
+
+const propertypesOptions = [
+  {
+    value: 1,
+    label: '机构',
+  },
+  {
+    value: 2,
+    label: '旅居',
+  },
+  {
+    value: 3,
+    label: '站点',
+  }
+]
+const applySystemOptions = [
+  {
+    value: 1,
+    label: '机构系统',
+  },
+  {
+    value: 2,
+    label: '旅居系统',
+  },
+  {
+    value: 3,
+    label: '旅居系统-小程序核销端',
+  }
+]
+const businessPatternOptions = [
+  {
+    value: 1,
+    label: '自建自营',
+  },
+  {
+    value: 2,
+    label: '合作项目',
+  },
+  {
+    value: 3,
+    label: '委托运营',
+  }
+]
+const businessStatusOptions = [
+  {
+    value: 0,
+    label: '在营',
+  },
+  {
+    value: 1,
+    label: '未开业',
+  }
+]
+const supportBiOptions = [
+  {
+    value: 0,
+    label: '是',
+  },
+  {
+    value: 1,
+    label: '否',
+  }
+]
+
 </script>