增加 Bpm Field 的 vModel 重复的问题

YunaiV
1 parent 930c5ec4
Showing 5 changed files with 310 additions and 52 deletions
sql/ruoyi-vue-pro.sql
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/BpmErrorCodeConstants.java
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/form/dto/BpmFormFieldRespDTO.java
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/form/impl/BpmFormServiceImpl.java
yudao-admin-ui/src/views/bpm/form/formEditor.vue
@@ -11,13 +11,43 @@
  Target Server Version : 80026
  File Encoding         : 65001
- Date: 15/12/2021 13:07:09
+ Date: 31/12/2021 23:18:07
 */
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
+-- Table structure for bpm_form
+-- ----------------------------
+DROP TABLE IF EXISTS `bpm_form`;
+CREATE TABLE `bpm_form` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ç¼–å·',
+  `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'è¡¨å•å',
+  `status` tinyint NOT NULL COMMENT 'å¼€å¯çŠ¶æ€',
+  `fields` varchar(5000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'è¡¨å•é¡¹çš„æ•°ç»„',
+  `conf` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'è¡¨å•çš„é…ç½®',
+  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'å¤‡æ³¨',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'åˆ›å»ºè€…',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'åˆ›å»ºæ—¶é—´',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'æ›´æ–°è€…',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ˜¯å¦åˆ é™¤',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='å·¥ä½œæµçš„è¡¨å•å®šä¹‰\n';
+
+-- ----------------------------
+-- Records of bpm_form
+-- ----------------------------
+BEGIN;
+INSERT INTO `bpm_form` VALUES (7, 'å•Š1', 1, '[\"{\\\"label\\\":\\\"å¯†ç \\\",\\\"tag\\\":\\\"el-input\\\",\\\"tagIcon\\\":\\\"password\\\",\\\"placeholder\\\":\\\"è¯·è¾“å…¥å¯†ç \\\",\\\"span\\\":24,\\\"show-password\\\":true,\\\"labelWidth\\\":null,\\\"style\\\":{\\\"width\\\":\\\"100%\\\"},\\\"clearable\\\":true,\\\"prepend\\\":\\\"\\\",\\\"append\\\":\\\"\\\",\\\"prefix-icon\\\":\\\"\\\",\\\"suffix-icon\\\":\\\"\\\",\\\"maxlength\\\":null,\\\"show-word-limit\\\":false,\\\"readonly\\\":false,\\\"disabled\\\":false,\\\"required\\\":true,\\\"regList\\\":[],\\\"changeTag\\\":true,\\\"document\\\":\\\"https://element.eleme.cn/#/zh-CN/component/input\\\",\\\"formId\\\":102,\\\"renderKey\\\":1640930414772,\\\"layout\\\":\\\"colFormItem\\\",\\\"vModel\\\":\\\"field102\\\",\\\"defaultValue\\\":\\\"admin123\\\"}\",\"{\\\"label\\\":\\\"çº§è”é€‰æ‹©\\\",\\\"tag\\\":\\\"el-cascader\\\",\\\"tagIcon\\\":\\\"cascader\\\",\\\"placeholder\\\":\\\"è¯·é€‰æ‹©çº§è”é€‰æ‹©çº§è”é€‰æ‹©çº§è”é€‰æ‹©\\\",\\\"defaultValue\\\":[],\\\"span\\\":24,\\\"labelWidth\\\":null,\\\"style\\\":{\\\"width\\\":\\\"100%\\\"},\\\"props\\\":{\\\"props\\\":{\\\"multiple\\\":false}},\\\"show-all-levels\\\":true,\\\"disabled\\\":false,\\\"clearable\\\":true,\\\"filterable\\\":false,\\\"required\\\":true,\\\"options\\\":[{\\\"id\\\":1,\\\"value\\\":1,\\\"label\\\":\\\"é€‰é¡¹1\\\",\\\"children\\\":[{\\\"id\\\":2,\\\"value\\\":2,\\\"label\\\":\\\"é€‰é¡¹1-1\\\"}]}],\\\"dataType\\\":\\\"dynamic\\\",\\\"labelKey\\\":\\\"label\\\",\\\"valueKey\\\":\\\"value\\\",\\\"childrenKey\\\":\\\"children\\\",\\\"separator\\\":\\\"/\\\",\\\"regList\\\":[],\\\"changeTag\\\":true,\\\"document\\\":\\\"https://element.eleme.cn/#/zh-CN/component/cascader\\\",\\\"formId\\\":101,\\\"renderKey\\\":1640960350991,\\\"layout\\\":\\\"colFormItem\\\",\\\"vModel\\\":\\\"field101\\\"}\",\"{\\\"label\\\":\\\"ç”Ÿæ´»\\\",\\\"tag\\\":\\\"el-input\\\",\\\"tagIcon\\\":\\\"input\\\",\\\"placeholder\\\":\\\"è¯·è¾“å…¥ç”Ÿæ´»ç”Ÿæ´»ç”Ÿæ´»\\\",\\\"span\\\":24,\\\"labelWidth\\\":null,\\\"style\\\":{\\\"width\\\":\\\"100%\\\"},\\\"clearable\\\":true,\\\"prepend\\\":\\\"\\\",\\\"append\\\":\\\"\\\",\\\"prefix-icon\\\":\\\"\\\",\\\"suffix-icon\\\":\\\"\\\",\\\"maxlength\\\":null,\\\"show-word-limit\\\":false,\\\"readonly\\\":false,\\\"disabled\\\":false,\\\"required\\\":true,\\\"regList\\\":[],\\\"changeTag\\\":true,\\\"document\\\":\\\"https://element.eleme.cn/#/zh-CN/component/input\\\",\\\"formId\\\":101,\\\"renderKey\\\":1640930388977,\\\"layout\\\":\\\"colFormItem\\\",\\\"vModel\\\":\\\"field101\\\",\\\"defaultValue\\\":\\\"admin\\\"}\"]', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true}', 'å“ˆå“ˆå“ˆå“ˆbiu', '1', '2021-12-31 10:10:13', '1', '2021-12-31 14:27:22', b'1');
+INSERT INTO `bpm_form` VALUES (8, 'å•Šå“ˆå“ˆ', 0, '[]', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true}', 'å“ˆå“ˆå“ˆå“ˆ', '1', '2021-12-31 10:17:26', '1', '2021-12-31 14:27:20', b'1');
+INSERT INTO `bpm_form` VALUES (9, 'æ–°å¢ž', 0, '[\"{\\\"label\\\":\\\"å•è¡Œæ–‡æœ¬\\\",\\\"tag\\\":\\\"el-input\\\",\\\"tagIcon\\\":\\\"input\\\",\\\"placeholder\\\":\\\"è¯·è¾“å…¥å•è¡Œæ–‡æœ¬\\\",\\\"span\\\":24,\\\"labelWidth\\\":null,\\\"style\\\":{\\\"width\\\":\\\"100%\\\"},\\\"clearable\\\":true,\\\"prepend\\\":\\\"\\\",\\\"append\\\":\\\"\\\",\\\"prefix-icon\\\":\\\"\\\",\\\"suffix-icon\\\":\\\"\\\",\\\"maxlength\\\":null,\\\"show-word-limit\\\":false,\\\"readonly\\\":false,\\\"disabled\\\":false,\\\"required\\\":true,\\\"regList\\\":[],\\\"changeTag\\\":true,\\\"document\\\":\\\"https://element.eleme.cn/#/zh-CN/component/input\\\",\\\"formId\\\":101,\\\"renderKey\\\":1640959561705,\\\"layout\\\":\\\"colFormItem\\\",\\\"vModel\\\":\\\"field101\\\"}\",\"{\\\"label\\\":\\\"å•é€‰æ¡†ç»„\\\",\\\"tag\\\":\\\"el-radio-group\\\",\\\"tagIcon\\\":\\\"radio\\\",\\\"span\\\":24,\\\"labelWidth\\\":null,\\\"style\\\":{},\\\"optionType\\\":\\\"default\\\",\\\"border\\\":false,\\\"size\\\":\\\"medium\\\",\\\"disabled\\\":false,\\\"required\\\":true,\\\"options\\\":[{\\\"label\\\":\\\"é€‰é¡¹ä¸€\\\",\\\"value\\\":1},{\\\"label\\\":\\\"é€‰é¡¹äºŒ\\\",\\\"value\\\":2}],\\\"regList\\\":[],\\\"changeTag\\\":true,\\\"document\\\":\\\"https://element.eleme.cn/#/zh-CN/component/radio\\\",\\\"formId\\\":102,\\\"renderKey\\\":1640959563240,\\\"layout\\\":\\\"colFormItem\\\",\\\"vModel\\\":\\\"field102\\\"}\"]', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true}', 'å“ˆå“ˆå“ˆ', '1', '2021-12-31 22:06:11', '1', '2021-12-31 14:27:19', b'1');
+INSERT INTO `bpm_form` VALUES (10, '11333', 1, '[\"{\\\"label\\\":\\\"å¤šè¡Œæ–‡æœ¬\\\",\\\"tag\\\":\\\"el-input\\\",\\\"tagIcon\\\":\\\"textarea\\\",\\\"type\\\":\\\"textarea\\\",\\\"placeholder\\\":\\\"è¯·è¾“å…¥å¤šè¡Œæ–‡æœ¬å¤šè¡Œæ–‡æœ¬å¤šè¡Œæ–‡æœ¬\\\",\\\"span\\\":24,\\\"labelWidth\\\":null,\\\"autosize\\\":{\\\"minRows\\\":4,\\\"maxRows\\\":4},\\\"style\\\":{\\\"width\\\":\\\"100%\\\"},\\\"maxlength\\\":null,\\\"show-word-limit\\\":false,\\\"readonly\\\":false,\\\"disabled\\\":false,\\\"required\\\":true,\\\"regList\\\":[],\\\"changeTag\\\":true,\\\"document\\\":\\\"https://element.eleme.cn/#/zh-CN/component/input\\\",\\\"formId\\\":101,\\\"renderKey\\\":1640959720587,\\\"layout\\\":\\\"colFormItem\\\",\\\"vModel\\\":\\\"field101\\\",\\\"defaultValue\\\":\\\"1111\\\"}\",\"{\\\"label\\\":\\\"æ»‘å—\\\",\\\"tag\\\":\\\"el-slider\\\",\\\"tagIcon\\\":\\\"slider\\\",\\\"defaultValue\\\":0,\\\"span\\\":24,\\\"labelWidth\\\":null,\\\"disabled\\\":false,\\\"required\\\":true,\\\"min\\\":0,\\\"max\\\":100,\\\"step\\\":1,\\\"show-stops\\\":false,\\\"range\\\":false,\\\"regList\\\":[],\\\"changeTag\\\":true,\\\"document\\\":\\\"https://element.eleme.cn/#/zh-CN/component/slider\\\",\\\"formId\\\":101,\\\"renderKey\\\":1640959732257,\\\"layout\\\":\\\"colFormItem\\\",\\\"vModel\\\":\\\"field101\\\"}\"]', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"left\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true}', '222211', '1', '2021-12-31 22:08:45', '1', '2021-12-31 14:27:17', b'1');
+INSERT INTO `bpm_form` VALUES (11, '1', 0, '[\"{\\\"label\\\":\\\"å•è¡Œæ–‡æœ¬\\\",\\\"tag\\\":\\\"el-input\\\",\\\"tagIcon\\\":\\\"input\\\",\\\"placeholder\\\":\\\"è¯·è¾“å…¥å•è¡Œæ–‡æœ¬\\\",\\\"span\\\":24,\\\"labelWidth\\\":null,\\\"style\\\":{\\\"width\\\":\\\"100%\\\"},\\\"clearable\\\":true,\\\"prepend\\\":\\\"\\\",\\\"append\\\":\\\"\\\",\\\"prefix-icon\\\":\\\"\\\",\\\"suffix-icon\\\":\\\"\\\",\\\"maxlength\\\":null,\\\"show-word-limit\\\":false,\\\"readonly\\\":false,\\\"disabled\\\":false,\\\"required\\\":true,\\\"regList\\\":[],\\\"changeTag\\\":true,\\\"document\\\":\\\"https://element.eleme.cn/#/zh-CN/component/input\\\",\\\"formId\\\":101,\\\"renderKey\\\":1640960802256,\\\"layout\\\":\\\"colFormItem\\\",\\\"vModel\\\":\\\"aoteman\\\",\\\"defaultValue\\\":\\\"admin\\\"}\",\"{\\\"label\\\":\\\"å¯†ç \\\",\\\"tag\\\":\\\"el-input\\\",\\\"tagIcon\\\":\\\"password\\\",\\\"placeholder\\\":\\\"è¯·è¾“å…¥å¯†ç \\\",\\\"span\\\":24,\\\"show-password\\\":true,\\\"labelWidth\\\":null,\\\"style\\\":{\\\"width\\\":\\\"100%\\\"},\\\"clearable\\\":true,\\\"prepend\\\":\\\"\\\",\\\"append\\\":\\\"\\\",\\\"prefix-icon\\\":\\\"\\\",\\\"suffix-icon\\\":\\\"\\\",\\\"maxlength\\\":null,\\\"show-word-limit\\\":false,\\\"readonly\\\":false,\\\"disabled\\\":false,\\\"required\\\":true,\\\"regList\\\":[],\\\"changeTag\\\":true,\\\"document\\\":\\\"https://element.eleme.cn/#/zh-CN/component/input\\\",\\\"formId\\\":102,\\\"renderKey\\\":1640960803756,\\\"layout\\\":\\\"colFormItem\\\",\\\"vModel\\\":\\\"password\\\",\\\"defaultValue\\\":\\\"admin123\\\"}\"]', '{\"formRef\":\"elForm\",\"formModel\":\"formData\",\"size\":\"medium\",\"labelPosition\":\"right\",\"labelWidth\":100,\"formRules\":\"rules\",\"gutter\":15,\"disabled\":false,\"span\":24,\"formBtns\":true}', '23', '1', '2021-12-31 22:26:53', '1', '2021-12-31 23:14:43', b'0');
+COMMIT;
+
+-- ----------------------------
 -- Table structure for inf_api_access_log
 -- ----------------------------
 DROP TABLE IF EXISTS `inf_api_access_log`;
@@ -44,7 +74,7 @@ CREATE TABLE `inf_api_access_log` (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ˜¯å¦åˆ é™¤',
   `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT 'ç§Ÿæˆ·ç¼–å·',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=3282 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='API è®¿é—®æ—¥å¿—è¡¨';
+) ENGINE=InnoDB AUTO_INCREMENT=5185 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='API è®¿é—®æ—¥å¿—è¡¨';
 -- ----------------------------
 -- Records of inf_api_access_log
@@ -86,7 +116,7 @@ CREATE TABLE `inf_api_error_log` (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ˜¯å¦åˆ é™¤',
   `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT 'ç§Ÿæˆ·ç¼–å·',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=81 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='ç³»ç»Ÿå¼‚å¸¸æ—¥å¿—';
+) ENGINE=InnoDB AUTO_INCREMENT=101 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='ç³»ç»Ÿå¼‚å¸¸æ—¥å¿—';
 -- ----------------------------
 -- Records of inf_api_error_log
@@ -119,7 +149,7 @@ CREATE TABLE `inf_config` (
 -- Records of inf_config
 -- ----------------------------
 BEGIN;
-INSERT INTO `inf_config` VALUES (1, 'ui', 1, 'ä¸»æ¡†æž¶é¡µ-é»˜è®¤çš®è‚¤æ ·å¼åç§°', 'sys.index.skinName', 'skin-blue', b'0', 'è“è‰² skin-blueã€ç»¿è‰² skin-greenã€ç´«è‰² skin-purpleã€çº¢è‰² skin-redã€é»„è‰² skin-yellow', 'admin', '2021-01-05 17:03:48', '', '2021-01-05 17:03:48', b'0');
+INSERT INTO `inf_config` VALUES (1, 'ui', 1, 'ä¸»æ¡†æž¶é¡µ-é»˜è®¤çš®è‚¤æ ·å¼åç§°', 'sys.index.skinName', 'skin-blue', b'0', 'è“è‰² skin-blueã€ç»¿è‰² skin-greenã€ç´«è‰² skin-purpleã€çº¢è‰² skin-redã€é»„è‰² skin-yellow', 'admin', '2021-01-05 17:03:48', '1', '2021-12-16 07:42:36', b'0');
 INSERT INTO `inf_config` VALUES (2, 'biz', 1, 'ç”¨æˆ·ç®¡ç†-è´¦å·åˆå§‹å¯†ç ', 'sys.user.init-password', '123456', b'0', 'åˆå§‹åŒ–å¯†ç  123456', 'admin', '2021-01-05 17:03:48', '', '2021-04-13 03:48:02', b'0');
 INSERT INTO `inf_config` VALUES (3, 'ui', 1, 'ä¸»æ¡†æž¶é¡µ-ä¾§è¾¹æ ä¸»é¢˜', 'sys.index.sideTheme', 'theme-dark', b'0', 'æ·±è‰²ä¸»é¢˜theme-darkï¼Œæµ…è‰²ä¸»é¢˜theme-light', 'admin', '2021-01-05 17:03:48', '', '2021-01-19 03:05:21', b'0');
 INSERT INTO `inf_config` VALUES (4, '1', 2, 'xxx', 'demo.test', '10', b'0', '5', '', '2021-01-19 03:10:26', '', '2021-01-20 09:25:55', b'0');
@@ -715,6 +745,51 @@ INSERT INTO `pay_order_extension` VALUES (100, &#39;20211027132205235959&#39;, 121, 9, &#39;
 COMMIT;
 -- ----------------------------
+-- Table structure for pay_refund
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_refund`;
+CREATE TABLE `pay_refund` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'æ”¯ä»˜é€€æ¬¾ç¼–å·',
+  `req_no` varchar(64) NOT NULL COMMENT 'é€€æ¬¾å•è¯·æ±‚å·',
+  `merchant_id` bigint NOT NULL COMMENT 'å•†æˆ·ç¼–å·',
+  `app_id` bigint NOT NULL COMMENT 'åº”ç”¨ç¼–å·',
+  `channel_id` bigint NOT NULL COMMENT 'æ¸ é“ç¼–å·',
+  `channel_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'æ¸ é“ç¼–ç ',
+  `order_id` bigint NOT NULL COMMENT 'æ”¯ä»˜è®¢å•ç¼–å· pay_order è¡¨id',
+  `trade_no` varchar(64) NOT NULL COMMENT 'äº¤æ˜“è®¢å•å· pay_extension è¡¨no å—æ®µ',
+  `merchant_order_id` varchar(64) NOT NULL COMMENT 'å•†æˆ·è®¢å•ç¼–å·ï¼ˆå•†æˆ·ç³»ç»Ÿç”Ÿæˆï¼‰',
+  `merchant_refund_no` varchar(64) NOT NULL COMMENT 'å•†æˆ·é€€æ¬¾è®¢å•å·ï¼ˆå•†æˆ·ç³»ç»Ÿç”Ÿæˆï¼‰',
+  `notify_url` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'å¼‚æ¥é€šçŸ¥å•†æˆ·åœ°å€',
+  `notify_status` tinyint NOT NULL COMMENT 'é€šçŸ¥å•†æˆ·é€€æ¬¾ç»“æžœçš„å›žè°ƒçŠ¶æ€',
+  `status` tinyint NOT NULL COMMENT 'é€€æ¬¾çŠ¶æ€',
+  `type` tinyint NOT NULL COMMENT 'é€€æ¬¾ç±»åž‹(éƒ¨åˆ†é€€æ¬¾ï¼Œå…¨éƒ¨é€€æ¬¾)',
+  `pay_amount` bigint NOT NULL COMMENT 'æ”¯ä»˜é‡‘é¢,å•ä½åˆ†',
+  `refund_amount` bigint NOT NULL COMMENT 'é€€æ¬¾é‡‘é¢,å•ä½åˆ†',
+  `reason` varchar(256) NOT NULL COMMENT 'é€€æ¬¾åŽŸå› ',
+  `user_ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'ç”¨æˆ· IP',
+  `channel_order_no` varchar(64) NOT NULL COMMENT 'æ¸ é“è®¢å•å·ï¼Œpay_order ä¸çš„channel_order_no å¯¹åº”',
+  `channel_refund_no` varchar(64) DEFAULT NULL COMMENT 'æ¸ é“é€€æ¬¾å•å·ï¼Œæ¸ é“è¿”å›ž',
+  `channel_error_code` varchar(128) DEFAULT NULL COMMENT 'æ¸ é“è°ƒç”¨æŠ¥é”™æ—¶ï¼Œé”™è¯¯ç ',
+  `channel_error_msg` varchar(256) DEFAULT NULL COMMENT 'æ¸ é“è°ƒç”¨æŠ¥é”™æ—¶ï¼Œé”™è¯¯ä¿¡æ¯',
+  `channel_extras` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'æ”¯ä»˜æ¸ é“çš„é¢å¤–å‚æ•°',
+  `expire_time` datetime DEFAULT NULL COMMENT 'é€€æ¬¾å¤±æ•ˆæ—¶é—´',
+  `success_time` datetime DEFAULT NULL COMMENT 'é€€æ¬¾æˆåŠŸæ—¶é—´',
+  `notify_time` datetime DEFAULT NULL COMMENT 'é€€æ¬¾é€šçŸ¥æ—¶é—´',
+  `creator` varchar(64) DEFAULT '' COMMENT 'åˆ›å»ºè€…',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'åˆ›å»ºæ—¶é—´',
+  `updater` varchar(64) DEFAULT '' COMMENT 'æ›´æ–°è€…',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ˜¯å¦åˆ é™¤',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='é€€æ¬¾è®¢å•';
+
+-- ----------------------------
+-- Records of pay_refund
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
 -- Table structure for sys_dept
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_dept`;
@@ -770,7 +845,7 @@ CREATE TABLE `sys_dict_data` (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ˜¯å¦åˆ é™¤',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='å—å…¸æ•°æ®è¡¨';
+) ENGINE=InnoDB AUTO_INCREMENT=1125 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='å—å…¸æ•°æ®è¡¨';
 -- ----------------------------
 -- Records of sys_dict_data
@@ -857,14 +932,37 @@ INSERT INTO `sys_dict_data` VALUES (88, 2, &#39;å©šå‡&#39;, &#39;3&#39;, &#39;oa_leave_type&#39;, 0, NU
 INSERT INTO `sys_dict_data` VALUES (89, 0, 'å¤„ç†ä¸', '1', 'oa_leave_status', 0, NULL, '1', '2021-09-21 22:46:46', '1', '2021-10-12 22:12:20', b'0');
 INSERT INTO `sys_dict_data` VALUES (90, 1, 'æµç¨‹ç»“æŸ', '2', 'oa_leave_status', 0, NULL, '1', '2021-09-21 22:47:03', '1', '2021-10-12 22:12:58', b'0');
 INSERT INTO `sys_dict_data` VALUES (91, 2, 'å®Œæˆ', '3', 'oa_leave_status', 0, NULL, '1', '2021-09-21 22:47:25', '1', '2021-10-12 14:13:06', b'1');
-INSERT INTO `sys_dict_data` VALUES (92, 1, 'å¯ç”¨', '0', 'pay_merchant_status', 0, 'å•†æˆ·å¯ç”¨', '1', '2021-11-03 11:30:52', '1', '2021-11-03 11:31:15', b'0');
-INSERT INTO `sys_dict_data` VALUES (93, 2, 'åœç”¨', '1', 'pay_merchant_status', 0, 'å•†æˆ·åœç”¨', '1', '2021-11-03 11:31:05', '1', '2021-11-03 11:31:05', b'0');
-INSERT INTO `sys_dict_data` VALUES (94, 1, 'å¼€å¯', '0', 'pay_app_status', 0, NULL, '1', '2021-11-06 19:42:10', '1', '2021-11-06 19:42:10', b'0');
-INSERT INTO `sys_dict_data` VALUES (95, 2, 'å…³é—', '1', 'pay_app_status', 0, NULL, '1', '2021-11-06 19:42:17', '1', '2021-11-06 19:42:17', b'0');
-INSERT INTO `sys_dict_data` VALUES (96, 1, 'å¼€å¯', '0', 'pay_channel_status', 0, 'å¼€å¯', '1', '2021-11-08 16:47:45', '1', '2021-11-08 16:47:45', b'0');
-INSERT INTO `sys_dict_data` VALUES (97, 2, 'å…³é—', '1', 'pay_channel_status', 0, 'å…³é—', '1', '2021-11-08 16:47:52', '1', '2021-11-08 16:47:52', b'0');
 INSERT INTO `sys_dict_data` VALUES (98, 1, 'v2', 'v2', 'pay_channel_wechat_version', 0, 'v2ç‰ˆæœ¬', '1', '2021-11-08 17:00:58', '1', '2021-11-08 17:00:58', b'0');
 INSERT INTO `sys_dict_data` VALUES (99, 2, 'v3', 'v3', 'pay_channel_wechat_version', 0, 'v3ç‰ˆæœ¬', '1', '2021-11-08 17:01:07', '1', '2021-11-08 17:01:07', b'0');
+INSERT INTO `sys_dict_data` VALUES (108, 1, 'RSA2', 'RSA2', 'pay_channel_alipay_sign_type', 0, 'RSA2', '1', '2021-11-18 15:39:29', '1', '2021-11-18 15:39:29', b'0');
+INSERT INTO `sys_dict_data` VALUES (109, 1, 'å…¬é’¥æ¨¡å¼', '1', 'pay_channel_alipay_mode', 0, 'å…¬é’¥æ¨¡å¼ï¼šprivateKey + alipayPublicKey', '1', '2021-11-18 15:45:23', '1', '2021-11-18 15:45:23', b'0');
+INSERT INTO `sys_dict_data` VALUES (110, 2, 'è¯ä¹¦æ¨¡å¼', '2', 'pay_channel_alipay_mode', 0, 'è¯ä¹¦æ¨¡å¼ï¼šappCertContent + alipayPublicCertContent + rootCertContent', '1', '2021-11-18 15:45:40', '1', '2021-11-18 15:45:40', b'0');
+INSERT INTO `sys_dict_data` VALUES (111, 1, 'çº¿ä¸Š', 'https://openapi.alipay.com/gateway.do', 'pay_channel_alipay_server_type', 0, 'ç½‘å…³åœ°å€ - çº¿ä¸Š', '1', '2021-11-18 16:59:32', '1', '2021-11-21 17:37:29', b'0');
+INSERT INTO `sys_dict_data` VALUES (112, 2, 'æ²™ç®±', 'https://openapi.alipaydev.com/gateway.do', 'pay_channel_alipay_server_type', 0, 'ç½‘å…³åœ°å€ - æ²™ç®±', '1', '2021-11-18 16:59:48', '1', '2021-11-21 17:37:39', b'0');
+INSERT INTO `sys_dict_data` VALUES (113, 1, 'å¾®ä¿¡ JSAPI æ”¯ä»˜', 'wx_pub', 'pay_channel_code_type', 0, 'å¾®ä¿¡ JSAPIï¼ˆå…¬ä¼—å·ï¼‰ æ”¯ä»˜', '1', '2021-12-03 10:40:24', '1', '2021-12-04 16:41:00', b'0');
+INSERT INTO `sys_dict_data` VALUES (114, 2, 'å¾®ä¿¡å°ç¨‹åºæ”¯ä»˜', 'wx_lite', 'pay_channel_code_type', 0, 'å¾®ä¿¡å°ç¨‹åºæ”¯ä»˜', '1', '2021-12-03 10:41:06', '1', '2021-12-03 10:41:06', b'0');
+INSERT INTO `sys_dict_data` VALUES (115, 3, 'å¾®ä¿¡ App æ”¯ä»˜', 'wx_app', 'pay_channel_code_type', 0, 'å¾®ä¿¡ App æ”¯ä»˜', '1', '2021-12-03 10:41:20', '1', '2021-12-03 10:41:20', b'0');
+INSERT INTO `sys_dict_data` VALUES (116, 4, 'æ”¯ä»˜å® PC ç½‘ç«™æ”¯ä»˜', 'alipay_pc', 'pay_channel_code_type', 0, 'æ”¯ä»˜å® PC ç½‘ç«™æ”¯ä»˜', '1', '2021-12-03 10:42:09', '1', '2021-12-03 10:42:09', b'0');
+INSERT INTO `sys_dict_data` VALUES (117, 5, 'æ”¯ä»˜å® Wap ç½‘ç«™æ”¯ä»˜', 'alipay_wap', 'pay_channel_code_type', 0, 'æ”¯ä»˜å® Wap ç½‘ç«™æ”¯ä»˜', '1', '2021-12-03 10:42:26', '1', '2021-12-03 10:42:26', b'0');
+INSERT INTO `sys_dict_data` VALUES (118, 6, 'æ”¯ä»˜å®App æ”¯ä»˜', 'alipay_app', 'pay_channel_code_type', 0, 'æ”¯ä»˜å®App æ”¯ä»˜', '1', '2021-12-03 10:42:55', '1', '2021-12-03 10:42:55', b'0');
+INSERT INTO `sys_dict_data` VALUES (119, 7, 'æ”¯ä»˜å®æ‰«ç æ”¯ä»˜', 'alipay_qr', 'pay_channel_code_type', 0, 'æ”¯ä»˜å®æ‰«ç æ”¯ä»˜', '1', '2021-12-03 10:43:10', '1', '2021-12-03 10:43:10', b'0');
+INSERT INTO `sys_dict_data` VALUES (120, 1, 'é€šçŸ¥æˆåŠŸ', '10', 'pay_order_notify_status', 0, 'é€šçŸ¥æˆåŠŸ', '1', '2021-12-03 11:02:41', '1', '2021-12-03 11:02:41', b'0');
+INSERT INTO `sys_dict_data` VALUES (121, 2, 'é€šçŸ¥å¤±è´¥', '20', 'pay_order_notify_status', 0, 'é€šçŸ¥å¤±è´¥', '1', '2021-12-03 11:02:59', '1', '2021-12-03 11:02:59', b'0');
+INSERT INTO `sys_dict_data` VALUES (122, 3, 'æœªé€šçŸ¥', '0', 'pay_order_notify_status', 0, 'æœªé€šçŸ¥', '1', '2021-12-03 11:03:10', '1', '2021-12-03 11:03:10', b'0');
+INSERT INTO `sys_dict_data` VALUES (123, 1, 'æ”¯ä»˜æˆåŠŸ', '10', 'pay_order_status', 0, 'æ”¯ä»˜æˆåŠŸ', '1', '2021-12-03 11:18:29', '1', '2021-12-03 11:28:32', b'0');
+INSERT INTO `sys_dict_data` VALUES (124, 2, 'æ”¯ä»˜å…³é—', '20', 'pay_order_status', 0, 'æ”¯ä»˜å…³é—', '1', '2021-12-03 11:18:42', '1', '2021-12-03 11:28:34', b'0');
+INSERT INTO `sys_dict_data` VALUES (125, 3, 'æœªæ”¯ä»˜', '0', 'pay_order_status', 0, 'æœªæ”¯ä»˜', '1', '2021-12-03 11:18:18', '1', '2021-12-03 11:28:36', b'0');
+INSERT INTO `sys_dict_data` VALUES (126, 1, 'æœªé€€æ¬¾', '0', 'pay_order_refund_status', 0, 'æœªé€€æ¬¾', '1', '2021-12-03 11:30:35', '1', '2021-12-03 11:34:05', b'0');
+INSERT INTO `sys_dict_data` VALUES (127, 2, 'éƒ¨åˆ†é€€æ¬¾', '10', 'pay_order_refund_status', 0, 'éƒ¨åˆ†é€€æ¬¾', '1', '2021-12-03 11:30:44', '1', '2021-12-03 11:34:10', b'0');
+INSERT INTO `sys_dict_data` VALUES (128, 3, 'å…¨éƒ¨é€€æ¬¾', '20', 'pay_order_refund_status', 0, 'å…¨éƒ¨é€€æ¬¾', '1', '2021-12-03 11:30:52', '1', '2021-12-03 11:34:14', b'0');
+INSERT INTO `sys_dict_data` VALUES (1117, 1, 'é€€æ¬¾è®¢å•ç”Ÿæˆ', '0', 'pay_refund_order_status', 0, 'é€€æ¬¾è®¢å•ç”Ÿæˆ', '1', '2021-12-10 16:44:44', '1', '2021-12-10 16:44:44', b'0');
+INSERT INTO `sys_dict_data` VALUES (1118, 2, 'é€€æ¬¾æˆåŠŸ', '1', 'pay_refund_order_status', 0, 'é€€æ¬¾æˆåŠŸ', '1', '2021-12-10 16:44:59', '1', '2021-12-10 16:44:59', b'0');
+INSERT INTO `sys_dict_data` VALUES (1119, 3, 'é€€æ¬¾å¤±è´¥', '2', 'pay_refund_order_status', 0, 'é€€æ¬¾å¤±è´¥', '1', '2021-12-10 16:45:10', '1', '2021-12-10 16:45:10', b'0');
+INSERT INTO `sys_dict_data` VALUES (1120, 4, 'é€€æ¬¾ä¸, æ¸ é“é€šçŸ¥ç»“æžœ', '3', 'pay_refund_order_status', 0, 'é€€æ¬¾ä¸, æ¸ é“é€šçŸ¥ç»“æžœ', '1', '2021-12-10 16:45:32', '1', '2021-12-10 16:45:32', b'0');
+INSERT INTO `sys_dict_data` VALUES (1121, 5, 'é€€æ¬¾ä¸, ç³»ç»ŸæŸ¥è¯¢ç»“æžœ', '4', 'pay_refund_order_status', 0, 'é€€æ¬¾ä¸, ç³»ç»ŸæŸ¥è¯¢ç»“æžœ', '1', '2021-12-10 16:45:48', '1', '2021-12-10 16:45:48', b'0');
+INSERT INTO `sys_dict_data` VALUES (1122, 6, 'çŠ¶æ€æœªçŸ¥ï¼Œéœ€è¦é‡è¯•', '5', 'pay_refund_order_status', 0, 'çŠ¶æ€æœªçŸ¥ï¼Œéœ€è¦é‡è¯•', '1', '2021-12-10 16:46:03', '1', '2021-12-10 16:46:03', b'0');
+INSERT INTO `sys_dict_data` VALUES (1123, 7, 'çŠ¶æ€æœªçŸ¥ï¼Œç³»ç»ŸæŸ¥è¯¢ç»“æžœ', '6', 'pay_refund_order_status', 0, 'çŠ¶æ€æœªçŸ¥ï¼Œç³»ç»ŸæŸ¥è¯¢ç»“æžœ', '1', '2021-12-10 16:46:13', '1', '2021-12-10 16:46:13', b'0');
+INSERT INTO `sys_dict_data` VALUES (1124, 8, 'é€€æ¬¾å…³é—', '99', 'pay_refund_order_status', 0, 'é€€æ¬¾å…³é—', '1', '2021-12-10 16:46:26', '1', '2021-12-10 16:46:26', b'0');
 COMMIT;
 -- ----------------------------
@@ -884,7 +982,7 @@ CREATE TABLE `sys_dict_type` (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ˜¯å¦åˆ é™¤',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE KEY `dict_type` (`type`)
-) ENGINE=InnoDB AUTO_INCREMENT=123 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='å—å…¸ç±»åž‹è¡¨';
+) ENGINE=InnoDB AUTO_INCREMENT=137 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='å—å…¸ç±»åž‹è¡¨';
 -- ----------------------------
 -- Records of sys_dict_type
@@ -915,10 +1013,16 @@ INSERT INTO `sys_dict_type` VALUES (115, &#39;é”™è¯¯ç çš„ç±»åž‹&#39;, &#39;sys_error_code_t
 INSERT INTO `sys_dict_type` VALUES (116, 'ç™»é™†æ—¥å¿—çš„ç±»åž‹', 'sys_login_type', 0, 'ç™»é™†æ—¥å¿—çš„ç±»åž‹', '1', '2021-10-06 00:50:46', '1', '2021-10-06 00:50:46', b'0');
 INSERT INTO `sys_dict_type` VALUES (117, 'è¯·å‡ç±»åž‹', 'oa_leave_type', 0, NULL, '1', '2021-09-21 22:34:33', '1', '2021-09-21 15:00:38', b'0');
 INSERT INTO `sys_dict_type` VALUES (118, 'è¯·å‡æµç¨‹çŠ¶æ€', 'oa_leave_status', 0, NULL, '1', '2021-09-21 22:46:04', '1', '2021-09-21 15:00:38', b'0');
-INSERT INTO `sys_dict_type` VALUES (119, 'å•†æˆ·çŠ¶æ€', 'pay_merchant_status', 0, 'å•†æˆ·çš„å¯ç”¨äºŽåœç”¨çŠ¶æ€', '1', '2021-11-03 11:29:04', '1', '2021-11-03 11:29:04', b'0');
-INSERT INTO `sys_dict_type` VALUES (120, 'æ”¯ä»˜åº”ç”¨çŠ¶æ€', 'pay_app_status', 0, 'æ”¯ä»˜åº”ç”¨çš„å¯åœçŠ¶æ€', '1', '2021-11-06 19:41:50', '1', '2021-11-06 19:41:50', b'0');
-INSERT INTO `sys_dict_type` VALUES (121, 'æ”¯ä»˜æ¸ é“çŠ¶æ€', 'pay_channel_status', 0, 'æ”¯ä»˜æ¸ é“çš„å¯åœçŠ¶æ€', '1', '2021-11-08 16:47:21', '1', '2021-11-08 16:47:21', b'0');
 INSERT INTO `sys_dict_type` VALUES (122, 'æ”¯ä»˜æ¸ é“å¾®ä¿¡ç‰ˆæœ¬', 'pay_channel_wechat_version', 0, 'æ”¯ä»˜æ¸ é“å¾®ä¿¡ç‰ˆæœ¬', '1', '2021-11-08 17:00:26', '1', '2021-11-08 17:00:26', b'0');
+INSERT INTO `sys_dict_type` VALUES (127, 'æ”¯ä»˜æ¸ é“æ”¯ä»˜å®ç®—æ³•ç±»åž‹', 'pay_channel_alipay_sign_type', 0, 'æ”¯ä»˜æ¸ é“æ”¯ä»˜å®ç®—æ³•ç±»åž‹', '1', '2021-11-18 15:39:09', '1', '2021-11-18 15:39:09', b'0');
+INSERT INTO `sys_dict_type` VALUES (128, 'æ”¯ä»˜æ¸ é“æ”¯ä»˜å®å…¬é’¥ç±»åž‹', 'pay_channel_alipay_mode', 0, 'æ”¯ä»˜æ¸ é“æ”¯ä»˜å®å…¬é’¥ç±»åž‹', '1', '2021-11-18 15:44:28', '1', '2021-11-18 15:44:28', b'0');
+INSERT INTO `sys_dict_type` VALUES (129, 'æ”¯ä»˜å®ç½‘å…³åœ°å€', 'pay_channel_alipay_server_type', 0, 'æ”¯ä»˜å®ç½‘å…³åœ°å€', '1', '2021-11-18 16:58:55', '1', '2021-11-18 17:01:34', b'0');
+INSERT INTO `sys_dict_type` VALUES (130, 'æ”¯ä»˜æ¸ é“ç¼–ç ç±»åž‹', 'pay_channel_code_type', 0, 'æ”¯ä»˜æ¸ é“çš„ç¼–ç ', '1', '2021-12-03 10:35:08', '1', '2021-12-03 10:35:08', b'0');
+INSERT INTO `sys_dict_type` VALUES (131, 'æ”¯ä»˜è®¢å•å›žè°ƒçŠ¶æ€', 'pay_order_notify_status', 0, 'æ”¯ä»˜è®¢å•å›žè°ƒçŠ¶æ€', '1', '2021-12-03 10:53:29', '1', '2021-12-03 10:53:29', b'0');
+INSERT INTO `sys_dict_type` VALUES (132, 'æ”¯ä»˜è®¢å•çŠ¶æ€', 'pay_order_status', 0, 'æ”¯ä»˜è®¢å•çŠ¶æ€', '1', '2021-12-03 11:17:50', '1', '2021-12-03 11:17:50', b'0');
+INSERT INTO `sys_dict_type` VALUES (133, 'æ”¯ä»˜è®¢å•é€€æ¬¾çŠ¶æ€', 'pay_order_refund_status', 0, 'æ”¯ä»˜è®¢å•é€€æ¬¾çŠ¶æ€', '1', '2021-12-03 11:27:31', '1', '2021-12-03 11:27:31', b'0');
+INSERT INTO `sys_dict_type` VALUES (134, 'é€€æ¬¾è®¢å•çŠ¶æ€', 'pay_refund_order_status', 0, 'é€€æ¬¾è®¢å•çŠ¶æ€', '1', '2021-12-10 16:42:50', '1', '2021-12-10 16:42:50', b'0');
+INSERT INTO `sys_dict_type` VALUES (135, 'é€€æ¬¾è®¢å•ç±»åˆ«', 'pay_refund_order_type', 0, 'é€€æ¬¾è®¢å•ç±»åˆ«', '1', '2021-12-10 17:14:53', '1', '2021-12-10 17:14:53', b'0');
 COMMIT;
 -- ----------------------------
@@ -938,7 +1042,7 @@ CREATE TABLE `sys_error_code` (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ˜¯å¦åˆ é™¤',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=4020 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='é”™è¯¯ç è¡¨';
+) ENGINE=InnoDB AUTO_INCREMENT=4035 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='é”™è¯¯ç è¡¨';
 -- ----------------------------
 -- Records of sys_error_code
@@ -1025,6 +1129,21 @@ INSERT INTO `sys_error_code` VALUES (4016, 1, &#39;yudao-admin-server&#39;, 1002000005, 
 INSERT INTO `sys_error_code` VALUES (4017, 1, 'yudao-admin-server', 1002000006, 'Token å·²ç»è¿‡æœŸ', '', NULL, '2021-10-02 22:14:57', NULL, '2021-10-10 22:47:27', b'0');
 INSERT INTO `sys_error_code` VALUES (4018, 1, 'yudao-admin-server', 1002014000, 'ç¤¾äº¤æŽˆæƒå¤±è´¥ï¼ŒåŽŸå› æ˜¯ï¼š{}', '', NULL, '2021-10-05 23:23:10', NULL, '2021-10-05 23:23:10', b'0');
 INSERT INTO `sys_error_code` VALUES (4019, 1, 'yudao-admin-server', 1002014001, 'ç¤¾äº¤è§£ç»‘å¤±è´¥ï¼Œéžå½“å‰ç”¨æˆ·ç»‘å®š', '', NULL, '2021-10-06 09:31:54', NULL, '2021-10-06 09:31:54', b'0');
+INSERT INTO `sys_error_code` VALUES (4020, 1, 'yudao-admin-server', 1003000001, 'æµç¨‹å®žä¾‹ä¸å˜åœ¨', '', NULL, '2021-12-30 20:02:57', NULL, '2021-12-30 20:02:57', b'0');
+INSERT INTO `sys_error_code` VALUES (4021, 1, 'yudao-admin-server', 1003000002, 'èŽ·å–é«˜äº®æµç¨‹å›¾å¼‚å¸¸', '', NULL, '2021-12-30 20:02:57', NULL, '2021-12-30 20:02:57', b'0');
+INSERT INTO `sys_error_code` VALUES (4022, 1, 'yudao-admin-server', 1003001001, 'è¯·å‡ç”³è¯·ä¸å˜åœ¨', '', NULL, '2021-12-30 20:02:57', NULL, '2021-12-30 20:02:57', b'0');
+INSERT INTO `sys_error_code` VALUES (4023, 1, 'yudao-admin-server', 1003001002, 'é¡¹ç›®ç»ç†å²—ä½æœªè®¾ç½®', '', NULL, '2021-12-30 20:02:57', NULL, '2021-12-31 22:02:34', b'0');
+INSERT INTO `sys_error_code` VALUES (4024, 1, 'yudao-admin-server', 1003001003, 'éƒ¨é—¨çš„é¡¹ç›®ç»ç†ä¸å˜åœ¨', '', NULL, '2021-12-30 20:02:57', NULL, '2021-12-30 20:02:57', b'0');
+INSERT INTO `sys_error_code` VALUES (4025, 1, 'yudao-admin-server', 1003001004, 'éƒ¨é—¨ç»ç†å²—ä½æœªè®¾ç½®', '', NULL, '2021-12-30 20:02:57', NULL, '2021-12-30 20:02:57', b'0');
+INSERT INTO `sys_error_code` VALUES (4026, 1, 'yudao-admin-server', 1003001005, 'éƒ¨é—¨çš„éƒ¨é—¨ç»ç†ä¸å˜åœ¨', '', NULL, '2021-12-30 20:02:57', NULL, '2021-12-30 20:02:57', b'0');
+INSERT INTO `sys_error_code` VALUES (4027, 1, 'yudao-admin-server', 1003001006, 'HRå²—ä½æœªè®¾ç½®', '', NULL, '2021-12-30 20:02:57', NULL, '2021-12-30 20:02:57', b'0');
+INSERT INTO `sys_error_code` VALUES (4028, 1, 'yudao-admin-server', 1003001007, 'è¯·å‡å¤©æ•°å¿…é¡»>=1', '', NULL, '2021-12-30 20:02:57', NULL, '2021-12-30 20:02:57', b'0');
+INSERT INTO `sys_error_code` VALUES (4029, 1, 'yudao-admin-server', 1004001001, 'æ¨¡åž‹æ•°æ®ä¸ºç©ºï¼Œè¯·å…ˆæˆåŠŸè®¾è®¡æµç¨‹å¹¶ä¿å˜', '', NULL, '2021-12-30 20:02:57', NULL, '2021-12-30 20:02:57', b'0');
+INSERT INTO `sys_error_code` VALUES (4030, 1, 'yudao-admin-server', 1004001002, 'å·¥ä½œæµæ¨¡åž‹å¼‚å¸¸', '', NULL, '2021-12-30 20:02:57', NULL, '2021-12-30 20:02:57', b'0');
+INSERT INTO `sys_error_code` VALUES (4031, 1, 'yudao-admin-server', 1004001003, 'æµç¨‹æ•°æ®ä¸ºç©º', '', NULL, '2021-12-30 20:02:57', NULL, '2021-12-30 20:02:57', b'0');
+INSERT INTO `sys_error_code` VALUES (4032, 1, 'yudao-admin-server', 1004001004, 'æµç¨‹å®šä¹‰ä¸å˜åœ¨', '', NULL, '2021-12-30 20:02:57', NULL, '2021-12-30 20:02:57', b'0');
+INSERT INTO `sys_error_code` VALUES (4033, 1, 'yudao-admin-server', 1003003000, 'è¡¨å•é¡¹({}) å’Œ ({}) ä½¿ç”¨äº†ç›¸åŒçš„å—æ®µå({})', '', NULL, '2021-12-31 23:08:54', NULL, '2021-12-31 23:14:16', b'0');
+INSERT INTO `sys_error_code` VALUES (4034, 1, 'yudao-admin-server', 1003003000, 'è¡¨å•é¡¹({}) å’Œ ({}) ä½¿ç”¨äº†ç›¸åŒçš„å—æ®µå({})', '', NULL, '2021-12-31 23:08:54', NULL, '2021-12-31 23:08:54', b'0');
 COMMIT;
 -- ----------------------------
@@ -1048,7 +1167,7 @@ CREATE TABLE `sys_login_log` (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ˜¯å¦åˆ é™¤',
   `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT 'ç§Ÿæˆ·ç¼–å·',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=474 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='ç³»ç»Ÿè®¿é—®è®°å½•';
+) ENGINE=InnoDB AUTO_INCREMENT=499 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='ç³»ç»Ÿè®¿é—®è®°å½•';
 -- ----------------------------
 -- Records of sys_login_log
@@ -1078,17 +1197,17 @@ CREATE TABLE `sys_menu` (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ˜¯å¦åˆ é™¤',
   `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT 'ç§Ÿæˆ·ç¼–å·',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1144 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='èœå•æƒé™è¡¨';
+) ENGINE=InnoDB AUTO_INCREMENT=1193 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='èœå•æƒé™è¡¨';
 -- ----------------------------
 -- Records of sys_menu
 -- ----------------------------
 BEGIN;
-INSERT INTO `sys_menu` VALUES (1, 'ç³»ç»Ÿç®¡ç†', '', 1, 1, 0, '/system', 'system', NULL, 0, 'admin', '2021-01-05 17:03:48', '1', '2021-12-05 22:51:03', b'0', 0);
-INSERT INTO `sys_menu` VALUES (2, 'åŸºç¡€è®¾æ–½', '', 1, 2, 0, '/infra', 'monitor', NULL, 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-20 14:18:35', b'0', 0);
-INSERT INTO `sys_menu` VALUES (3, 'ç ”å‘å·¥å…·', '', 1, 3, 0, '/tool', 'tool', NULL, 0, 'admin', '2021-01-05 17:03:48', '', '2021-02-06 12:44:42', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1, 'ç³»ç»Ÿç®¡ç†', '', 1, 10, 0, '/system', 'system', NULL, 0, 'admin', '2021-01-05 17:03:48', '1', '2021-12-25 16:43:08', b'0', 0);
+INSERT INTO `sys_menu` VALUES (2, 'åŸºç¡€è®¾æ–½', '', 1, 20, 0, '/infra', 'monitor', NULL, 0, 'admin', '2021-01-05 17:03:48', '1', '2021-12-25 16:43:18', b'0', 0);
+INSERT INTO `sys_menu` VALUES (3, 'ç ”å‘å·¥å…·', '', 1, 30, 0, '/tool', 'tool', NULL, 0, 'admin', '2021-01-05 17:03:48', '1', '2021-12-25 16:43:13', b'0', 0);
 INSERT INTO `sys_menu` VALUES (4, 'è‹¥ä¾å®˜ç½‘', '', 1, 4, 0, 'http://ruoyi.vip', 'guide', NULL, 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-20 21:54:28', b'1', 0);
-INSERT INTO `sys_menu` VALUES (5, 'OA åŠžå…¬', '', 1, 4, 0, '/oa', 'people', NULL, 0, 'admin', '2021-09-20 16:26:19', '1', '2021-09-20 13:55:54', b'0', 0);
+INSERT INTO `sys_menu` VALUES (5, 'OA åŠžå…¬', '', 1, 40, 0, '/oa', 'people', NULL, 0, 'admin', '2021-09-20 16:26:19', '1', '2021-12-25 16:43:22', b'0', 0);
 INSERT INTO `sys_menu` VALUES (100, 'ç”¨æˆ·ç®¡ç†', 'system:user:list', 2, 1, 1, 'user', 'user', 'system/user/index', 0, 'admin', '2021-01-05 17:03:48', '', '2021-01-05 22:36:45', b'0', 0);
 INSERT INTO `sys_menu` VALUES (101, 'è§’è‰²ç®¡ç†', '', 2, 2, 1, 'role', 'peoples', 'system/role/index', 0, 'admin', '2021-01-05 17:03:48', '1', '2021-03-14 22:04:49', b'0', 0);
 INSERT INTO `sys_menu` VALUES (102, 'èœå•ç®¡ç†', '', 2, 3, 1, 'menu', 'tree-table', 'system/menu/index', 0, 'admin', '2021-01-05 17:03:48', '1', '2021-03-14 22:04:28', b'0', 0);
@@ -1217,6 +1336,7 @@ INSERT INTO `sys_menu` VALUES (1113, &#39;é”™è¯¯ç æ›´æ–°&#39;, &#39;system:error-code:updat
 INSERT INTO `sys_menu` VALUES (1114, 'é”™è¯¯ç åˆ é™¤', 'system:error-code:delete', 3, 4, 1110, '', '', '', 0, '', '2021-04-13 21:46:42', '', '2021-04-13 22:09:51', b'0', 0);
 INSERT INTO `sys_menu` VALUES (1115, 'é”™è¯¯ç å¯¼å‡º', 'system:error-code:export', 3, 5, 1110, '', '', '', 0, '', '2021-04-13 21:46:42', '', '2021-04-13 22:09:55', b'0', 0);
 INSERT INTO `sys_menu` VALUES (1116, 'æ—¥å¿—ä¸å¿ƒ', '', 2, 8, 2, 'log-center', 'log', 'infra/skywalking/log', 0, '1', '2021-04-26 22:35:45', '1', '2021-04-26 22:37:25', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1117, 'æ”¯ä»˜ç®¡ç†', '', 1, 11, 0, '/pay', 'money', NULL, 0, '1', '2021-12-25 16:43:41', '1', '2021-12-25 16:46:40', b'0', 0);
 INSERT INTO `sys_menu` VALUES (1118, 'è¯·å‡æŸ¥è¯¢', '', 2, 0, 5, 'oa/leave', 'user', 'oa/leave/index', 0, '', '2021-09-20 08:51:03', '1', '2021-10-12 22:19:02', b'0', 0);
 INSERT INTO `sys_menu` VALUES (1119, 'è¯·å‡ç”³è¯·æŸ¥è¯¢', 'oa:leave:query', 3, 1, 1118, '', '', '', 0, '', '2021-09-20 08:51:03', '', '2021-09-20 08:51:03', b'0', 0);
 INSERT INTO `sys_menu` VALUES (1120, 'è¯·å‡ç”³è¯·åˆ›å»º', 'oa:leave:create', 3, 2, 1118, '', '', '', 0, '', '2021-09-20 08:51:03', '', '2021-09-20 08:51:03', b'0', 0);
@@ -1225,7 +1345,7 @@ INSERT INTO `sys_menu` VALUES (1122, &#39;è¯·å‡ç”³è¯·åˆ é™¤&#39;, &#39;oa:leave:delete&#39;, 3,
 INSERT INTO `sys_menu` VALUES (1123, 'è¯·å‡ç”³è¯·å¯¼å‡º', 'oa:leave:export', 3, 5, 1118, '', '', '', 0, '', '2021-09-20 08:51:03', '', '2021-09-20 08:51:03', b'0', 0);
 INSERT INTO `sys_menu` VALUES (1124, 'å¾…åŠžä»»åŠ¡', '', 2, 2, 5, 'todo', 'edit', 'oa/todo/index', 0, '1', '2021-09-20 22:10:09', '1', '2021-09-21 23:17:12', b'0', 0);
 INSERT INTO `sys_menu` VALUES (1125, 'æµç¨‹ç”³è¯·', '', 2, 3, 5, 'flow', 'form', 'oa/flow/index', 0, '1', '2021-10-23 22:10:09', '1', '2021-10-23 23:17:12', b'0', 0);
-INSERT INTO `sys_menu` VALUES (1126, 'æ”¯ä»˜åº”ç”¨ä¿¡æ¯ç®¡ç†', '', 2, 0, 1117, 'app', '', 'pay/app/index', 0, '', '2021-11-10 01:13:30', '', '2021-11-10 01:13:30', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1126, 'åº”ç”¨ä¿¡æ¯', '', 2, 1, 1117, 'app', 'table', 'pay/app/index', 0, '', '2021-11-10 01:13:30', '1', '2021-12-25 16:56:41', b'0', 0);
 INSERT INTO `sys_menu` VALUES (1127, 'æ”¯ä»˜åº”ç”¨ä¿¡æ¯æŸ¥è¯¢', 'pay:app:query', 3, 1, 1126, '', '', '', 0, '', '2021-11-10 01:13:31', '', '2021-11-10 01:13:31', b'0', 0);
 INSERT INTO `sys_menu` VALUES (1128, 'æ”¯ä»˜åº”ç”¨ä¿¡æ¯åˆ›å»º', 'pay:app:create', 3, 2, 1126, '', '', '', 0, '', '2021-11-10 01:13:31', '', '2021-11-10 01:13:31', b'0', 0);
 INSERT INTO `sys_menu` VALUES (1129, 'æ”¯ä»˜åº”ç”¨ä¿¡æ¯æ›´æ–°', 'pay:app:update', 3, 3, 1126, '', '', '', 0, '', '2021-11-10 01:13:31', '', '2021-11-10 01:13:31', b'0', 0);
@@ -1243,6 +1363,44 @@ INSERT INTO `sys_menu` VALUES (1140, &#39;ç§Ÿæˆ·åˆ›å»º&#39;, &#39;system:tenant:create&#39;, 3, 
 INSERT INTO `sys_menu` VALUES (1141, 'ç§Ÿæˆ·æ›´æ–°', 'system:tenant:update', 3, 3, 1138, '', '', '', 0, '', '2021-12-14 12:31:44', '', '2021-12-14 12:31:44', b'0', 0);
 INSERT INTO `sys_menu` VALUES (1142, 'ç§Ÿæˆ·åˆ é™¤', 'system:tenant:delete', 3, 4, 1138, '', '', '', 0, '', '2021-12-14 12:31:44', '', '2021-12-14 12:31:44', b'0', 0);
 INSERT INTO `sys_menu` VALUES (1143, 'ç§Ÿæˆ·å¯¼å‡º', 'system:tenant:export', 3, 5, 1138, '', '', '', 0, '', '2021-12-14 12:31:44', '', '2021-12-14 12:31:44', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1144, 'æ”¯ä»˜åº”ç”¨ä¿¡æ¯ç®¡ç†', '', 2, 0, 1117, 'app', '', 'pay/app/index', 0, '', '2021-12-25 08:26:31', '', '2021-12-25 08:48:05', b'1', 0);
+INSERT INTO `sys_menu` VALUES (1145, 'æ”¯ä»˜åº”ç”¨ä¿¡æ¯æŸ¥è¯¢', 'pay:app:query', 3, 1, 1144, '', '', '', 0, '', '2021-12-25 08:26:31', '', '2021-12-25 08:47:53', b'1', 0);
+INSERT INTO `sys_menu` VALUES (1146, 'æ”¯ä»˜åº”ç”¨ä¿¡æ¯åˆ›å»º', 'pay:app:create', 3, 2, 1144, '', '', '', 0, '', '2021-12-25 08:26:31', '', '2021-12-25 08:47:51', b'1', 0);
+INSERT INTO `sys_menu` VALUES (1147, 'æ”¯ä»˜åº”ç”¨ä¿¡æ¯æ›´æ–°', 'pay:app:update', 3, 3, 1144, '', '', '', 0, '', '2021-12-25 08:26:31', '', '2021-12-25 08:47:48', b'1', 0);
+INSERT INTO `sys_menu` VALUES (1148, 'æ”¯ä»˜åº”ç”¨ä¿¡æ¯åˆ é™¤', 'pay:app:delete', 3, 4, 1144, '', '', '', 0, '', '2021-12-25 08:26:31', '', '2021-12-25 08:47:46', b'1', 0);
+INSERT INTO `sys_menu` VALUES (1149, 'æ”¯ä»˜åº”ç”¨ä¿¡æ¯å¯¼å‡º', 'pay:app:export', 3, 5, 1144, '', '', '', 0, '', '2021-12-25 08:26:31', '', '2021-12-25 08:47:43', b'1', 0);
+INSERT INTO `sys_menu` VALUES (1150, 'ç§˜é’¥è§£æž', 'pay:channel:parsing', 3, 6, 1129, '', '', '', 0, '1', '2021-11-08 15:15:47', '1', '2021-11-08 15:15:47', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1156, 'æ”¯ä»˜è®¢å•æŸ¥è¯¢', 'pay:order:query', 3, 1, 1155, '', '', '', 0, '', '2021-12-25 08:29:01', '', '2021-12-25 08:29:01', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1157, 'æ”¯ä»˜è®¢å•åˆ›å»º', 'pay:order:create', 3, 2, 1155, '', '', '', 0, '', '2021-12-25 08:29:01', '', '2021-12-25 08:29:01', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1158, 'æ”¯ä»˜è®¢å•æ›´æ–°', 'pay:order:update', 3, 3, 1155, '', '', '', 0, '', '2021-12-25 08:29:01', '', '2021-12-25 08:29:01', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1159, 'æ”¯ä»˜è®¢å•åˆ é™¤', 'pay:order:delete', 3, 4, 1155, '', '', '', 0, '', '2021-12-25 08:29:01', '', '2021-12-25 08:29:01', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1160, 'æ”¯ä»˜è®¢å•å¯¼å‡º', 'pay:order:export', 3, 5, 1155, '', '', '', 0, '', '2021-12-25 08:29:01', '', '2021-12-25 08:29:01', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1161, 'é€€æ¬¾è®¢å•', '', 2, 3, 1117, 'refund', 'order', 'pay/refund/index', 0, '', '2021-12-25 08:29:07', '1', '2021-12-25 19:30:22', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1162, 'é€€æ¬¾è®¢å•æŸ¥è¯¢', 'pay:refund:query', 3, 1, 1161, '', '', '', 0, '', '2021-12-25 08:29:07', '', '2021-12-25 08:29:07', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1163, 'é€€æ¬¾è®¢å•åˆ›å»º', 'pay:refund:create', 3, 2, 1161, '', '', '', 0, '', '2021-12-25 08:29:07', '', '2021-12-25 08:29:07', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1164, 'é€€æ¬¾è®¢å•æ›´æ–°', 'pay:refund:update', 3, 3, 1161, '', '', '', 0, '', '2021-12-25 08:29:07', '', '2021-12-25 08:29:07', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1165, 'é€€æ¬¾è®¢å•åˆ é™¤', 'pay:refund:delete', 3, 4, 1161, '', '', '', 0, '', '2021-12-25 08:29:07', '', '2021-12-25 08:29:07', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1166, 'é€€æ¬¾è®¢å•å¯¼å‡º', 'pay:refund:export', 3, 5, 1161, '', '', '', 0, '', '2021-12-25 08:29:07', '', '2021-12-25 08:29:07', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1173, 'æ”¯ä»˜è®¢å•', '', 2, 2, 1117, 'order', 'pay', 'pay/order/index', 0, '', '2021-12-25 08:49:43', '1', '2021-12-25 19:29:54', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1174, 'æ”¯ä»˜è®¢å•æŸ¥è¯¢', 'pay:order:query', 3, 1, 1173, '', '', '', 0, '', '2021-12-25 08:49:43', '', '2021-12-25 08:49:43', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1175, 'æ”¯ä»˜è®¢å•åˆ›å»º', 'pay:order:create', 3, 2, 1173, '', '', '', 0, '', '2021-12-25 08:49:43', '', '2021-12-25 08:49:43', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1176, 'æ”¯ä»˜è®¢å•æ›´æ–°', 'pay:order:update', 3, 3, 1173, '', '', '', 0, '', '2021-12-25 08:49:43', '', '2021-12-25 08:49:43', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1177, 'æ”¯ä»˜è®¢å•åˆ é™¤', 'pay:order:delete', 3, 4, 1173, '', '', '', 0, '', '2021-12-25 08:49:43', '', '2021-12-25 08:49:43', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1178, 'æ”¯ä»˜è®¢å•å¯¼å‡º', 'pay:order:export', 3, 5, 1173, '', '', '', 0, '', '2021-12-25 08:49:43', '', '2021-12-25 08:49:43', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1179, 'å•†æˆ·ä¿¡æ¯', '', 2, 0, 1117, 'merchant', 'merchant', 'pay/merchant/index', 0, '', '2021-12-25 09:01:44', '1', '2021-12-25 17:02:13', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1180, 'æ”¯ä»˜å•†æˆ·ä¿¡æ¯æŸ¥è¯¢', 'pay:merchant:query', 3, 1, 1179, '', '', '', 0, '', '2021-12-25 09:01:44', '', '2021-12-25 09:01:44', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1181, 'æ”¯ä»˜å•†æˆ·ä¿¡æ¯åˆ›å»º', 'pay:merchant:create', 3, 2, 1179, '', '', '', 0, '', '2021-12-25 09:01:44', '', '2021-12-25 09:01:44', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1182, 'æ”¯ä»˜å•†æˆ·ä¿¡æ¯æ›´æ–°', 'pay:merchant:update', 3, 3, 1179, '', '', '', 0, '', '2021-12-25 09:01:44', '', '2021-12-25 09:01:44', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1183, 'æ”¯ä»˜å•†æˆ·ä¿¡æ¯åˆ é™¤', 'pay:merchant:delete', 3, 4, 1179, '', '', '', 0, '', '2021-12-25 09:01:44', '', '2021-12-25 09:01:44', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1184, 'æ”¯ä»˜å•†æˆ·ä¿¡æ¯å¯¼å‡º', 'pay:merchant:export', 3, 5, 1179, '', '', '', 0, '', '2021-12-25 09:01:44', '', '2021-12-25 09:01:44', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1185, 'å·¥ä½œæµ', '', 1, 50, 0, '/bpm', 'tool', NULL, 0, '1', '2021-12-30 20:26:36', '1', '2021-12-30 20:26:36', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1186, 'æµç¨‹ç®¡ç†', '', 1, 10, 1185, 'manager', 'nested', NULL, 0, '1', '2021-12-30 20:28:30', '1', '2021-12-30 20:28:57', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1187, 'æµç¨‹è¡¨å•', '', 2, 0, 1186, 'form', '', 'bpm/form/index', 0, '', '2021-12-30 12:38:22', '1', '2021-12-30 20:38:48', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1188, 'æµç¨‹è¡¨å•çš„æŸ¥è¯¢', 'bpm:form:query', 3, 1, 1187, '', '', '', 0, '', '2021-12-30 12:38:22', '1', '2021-12-30 20:38:56', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1189, 'æµç¨‹è¡¨å•çš„åˆ›å»º', 'bpm:form:create', 3, 2, 1187, '', '', '', 0, '', '2021-12-30 12:38:22', '1', '2021-12-30 20:39:00', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1190, 'æµç¨‹è¡¨å•çš„æ›´æ–°', 'bpm:form:update', 3, 3, 1187, '', '', '', 0, '', '2021-12-30 12:38:22', '1', '2021-12-30 20:39:04', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1191, 'æµç¨‹è¡¨å•çš„åˆ é™¤', 'bpm:form:delete', 3, 4, 1187, '', '', '', 0, '', '2021-12-30 12:38:22', '1', '2021-12-30 20:39:08', b'0', 0);
+INSERT INTO `sys_menu` VALUES (1192, 'æµç¨‹è¡¨å•çš„å¯¼å‡º', 'bpm:form:export', 3, 5, 1187, '', '', '', 0, '', '2021-12-30 12:38:22', '1', '2021-12-30 20:39:13', b'0', 0);
 COMMIT;
 -- ----------------------------
@@ -1304,7 +1462,7 @@ CREATE TABLE `sys_operate_log` (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ˜¯å¦åˆ é™¤',
   `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT 'ç§Ÿæˆ·ç¼–å·',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=85 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='æ“ä½œæ—¥å¿—è®°å½•';
+) ENGINE=InnoDB AUTO_INCREMENT=174 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='æ“ä½œæ—¥å¿—è®°å½•';
 -- ----------------------------
 -- Records of sys_operate_log
@@ -1371,7 +1529,7 @@ CREATE TABLE `sys_role` (
 BEGIN;
 INSERT INTO `sys_role` VALUES (1, 'è¶…çº§ç®¡ç†å‘˜', 'admin', 1, 1, '', 0, 1, 'è¶…çº§ç®¡ç†å‘˜', 'admin', '2021-01-05 17:03:48', '', '2021-12-15 04:52:44', b'0');
 INSERT INTO `sys_role` VALUES (2, 'æ™®é€šè§’è‰²', 'common', 2, 2, '', 0, 1, 'æ™®é€šè§’è‰²', 'admin', '2021-01-05 17:03:48', '', '2021-01-06 11:46:58', b'0');
-INSERT INTO `sys_role` VALUES (101, 'æµ‹è¯•è´¦å·', 'test', 0, 2, '[104]', 0, 2, '132', '', '2021-01-06 13:49:35', '1', '2021-03-14 22:17:20', b'0');
+INSERT INTO `sys_role` VALUES (101, 'æµ‹è¯•è´¦å·', 'test', 0, 2, '[102,108,109]', 0, 2, '132', '', '2021-01-06 13:49:35', '1', '2021-12-16 09:27:01', b'0');
 COMMIT;
 -- ----------------------------
@@ -1388,7 +1546,7 @@ CREATE TABLE `sys_role_menu` (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ˜¯å¦åˆ é™¤',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=239 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='è§’è‰²å’Œèœå•å…³è”è¡¨';
+) ENGINE=InnoDB AUTO_INCREMENT=253 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='è§’è‰²å’Œèœå•å…³è”è¡¨';
 -- ----------------------------
 -- Records of sys_role_menu
@@ -1548,6 +1706,20 @@ INSERT INTO `sys_role_menu` VALUES (235, 101, 101, &#39;&#39;, &#39;2021-01-21 03:23:27&#39;, &#39;&#39;
 INSERT INTO `sys_role_menu` VALUES (236, 101, 1063, '', '2021-01-21 03:23:27', '', '2021-01-21 03:23:27', b'0');
 INSERT INTO `sys_role_menu` VALUES (237, 101, 1064, '', '2021-01-21 03:23:27', '', '2021-01-21 03:23:27', b'0');
 INSERT INTO `sys_role_menu` VALUES (238, 101, 1065, '', '2021-01-21 03:23:27', '', '2021-01-21 03:23:27', b'0');
+INSERT INTO `sys_role_menu` VALUES (239, 101, 100, '1', '2021-12-15 22:47:51', '1', '2021-12-15 22:47:51', b'0');
+INSERT INTO `sys_role_menu` VALUES (240, 101, 1001, '1', '2021-12-15 22:47:51', '1', '2021-12-15 22:47:51', b'0');
+INSERT INTO `sys_role_menu` VALUES (241, 101, 1002, '1', '2021-12-15 22:47:51', '1', '2021-12-15 22:47:51', b'0');
+INSERT INTO `sys_role_menu` VALUES (242, 101, 1003, '1', '2021-12-15 22:47:51', '1', '2021-12-15 22:47:51', b'0');
+INSERT INTO `sys_role_menu` VALUES (243, 101, 1004, '1', '2021-12-15 22:47:51', '1', '2021-12-15 22:47:51', b'0');
+INSERT INTO `sys_role_menu` VALUES (244, 101, 1005, '1', '2021-12-15 22:47:51', '1', '2021-12-15 22:47:51', b'0');
+INSERT INTO `sys_role_menu` VALUES (245, 101, 1006, '1', '2021-12-15 22:47:51', '1', '2021-12-15 22:47:51', b'0');
+INSERT INTO `sys_role_menu` VALUES (246, 101, 1007, '1', '2021-12-15 22:47:51', '1', '2021-12-15 22:47:51', b'0');
+INSERT INTO `sys_role_menu` VALUES (247, 101, 1138, '1', '2021-12-15 22:47:51', '1', '2021-12-15 22:47:51', b'0');
+INSERT INTO `sys_role_menu` VALUES (248, 101, 1139, '1', '2021-12-15 22:47:51', '1', '2021-12-15 22:47:51', b'0');
+INSERT INTO `sys_role_menu` VALUES (249, 101, 1140, '1', '2021-12-15 22:47:51', '1', '2021-12-15 22:47:51', b'0');
+INSERT INTO `sys_role_menu` VALUES (250, 101, 1141, '1', '2021-12-15 22:47:51', '1', '2021-12-15 22:47:51', b'0');
+INSERT INTO `sys_role_menu` VALUES (251, 101, 1142, '1', '2021-12-15 22:47:51', '1', '2021-12-15 22:47:51', b'0');
+INSERT INTO `sys_role_menu` VALUES (252, 101, 1143, '1', '2021-12-15 22:47:51', '1', '2021-12-15 22:47:51', b'0');
 COMMIT;
 -- ----------------------------
@@ -1798,13 +1970,13 @@ CREATE TABLE `sys_user` (
 -- Records of sys_user
 -- ----------------------------
 BEGIN;
-INSERT INTO `sys_user` VALUES (1, 'admin', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', 'èŠ‹é“æºç ', 'ç®¡ç†å‘˜', 103, '[1]', 'aoteman@126.com', '15612345678', 1, 'http://127.0.0.1:48080/api/infra/file/get/7e7ed694-2242-46cf-9ac9-0709debcc22f', 0, '127.0.0.1', '2021-12-15 12:33:21', 'admin', '2021-01-05 17:03:47', NULL, '2021-12-15 12:33:21', b'0', 1);
+INSERT INTO `sys_user` VALUES (1, 'admin', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', 'èŠ‹é“æºç ', 'ç®¡ç†å‘˜', 103, '[1]', 'aoteman@126.com', '15612345678', 1, 'http://127.0.0.1:48080/api/infra/file/get/7e7ed694-2242-46cf-9ac9-0709debcc22f', 0, '127.0.0.1', '2021-12-31 22:57:57', 'admin', '2021-01-05 17:03:47', NULL, '2021-12-31 22:57:57', b'0', 1);
 INSERT INTO `sys_user` VALUES (2, 'ry', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', 'è‹¥ä¾', 'æµ‹è¯•å‘˜', 103, '[2]', 'ry@qq.com', '15666666666', 1, '', 0, '127.0.0.1', '2021-01-05 17:03:47', 'admin', '2021-01-05 17:03:47', '', '2021-12-13 01:26:34', b'1', 1);
-INSERT INTO `sys_user` VALUES (100, 'yudao', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', 'èŠ‹é“', 'ä¸è¦å“æˆ‘', 103, '[1]', 'yudao@iocoder.cn', '15601691300', 1, '', 1, '', NULL, '', '2021-01-07 09:07:17', '1', '2021-12-13 01:26:55', b'0', 1);
-INSERT INTO `sys_user` VALUES (103, 'yuanma', '', 'æºç ', NULL, 100, NULL, 'yuanma@iocoder.cn', '15601701300', 0, '', 0, '', NULL, '', '2021-01-13 23:50:35', '', '2021-12-05 02:22:01', b'0', 1);
-INSERT INTO `sys_user` VALUES (104, 'test', '$2a$10$.TOFpaIiI3PzEwkGrNq0Eu6Cc3rOqJMxTb1DqeSEM8StxaGPBRKoi', 'æµ‹è¯•å·', NULL, 100, '[]', '', '15601691200', 1, '', 0, '127.0.0.1', '2021-12-13 07:41:55', '', '2021-01-21 02:13:53', NULL, '2021-12-13 07:41:55', b'0', 1);
-INSERT INTO `sys_user` VALUES (105, 'hradmin', '$2a$10$JEhJOL25X1eMnFfR3PILo.MoAljf29YukpL2w6H9GvVGjmqOCuh.O', 'hr-mgr', 'hr ç®¡ç†å‘˜', 100, '[3]', '', '', 1, '', 0, '127.0.0.1', '2021-10-30 21:19:36', '1', '2021-09-25 16:50:41', NULL, '2021-12-05 02:22:03', b'0', 1);
-INSERT INTO `sys_user` VALUES (106, 'zhijiantianya', '$2a$10$Y0hSfV2udA8quqMeWukhTuHEoKpQ5tDhclG8WUWSOH7o/MGw185Ti', 'èŠ‹é“æºç ', '', NULL, NULL, '', '', 3, 'https://portrait.gitee.com/uploads/avatars/user/0/176_zhijiantianya_1578913741.png', 0, '', NULL, NULL, '2021-09-28 09:40:59', NULL, '2021-12-05 02:22:04', b'0', 1);
+INSERT INTO `sys_user` VALUES (100, 'yudao', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', 'èŠ‹é“', 'ä¸è¦å“æˆ‘', 104, '[1]', 'yudao@iocoder.cn', '15601691300', 1, '', 1, '', NULL, '', '2021-01-07 09:07:17', '104', '2021-12-16 09:26:10', b'0', 1);
+INSERT INTO `sys_user` VALUES (103, 'yuanma', '', 'æºç ', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, '', 0, '', NULL, '', '2021-01-13 23:50:35', '104', '2021-12-16 09:26:05', b'0', 1);
+INSERT INTO `sys_user` VALUES (104, 'test', '$2a$10$CkyM2xvzUhSWsh.JqGcSju.KjlPsaX1A76wO8O/mYtkpQvcp2jWTW', 'æµ‹è¯•å·', NULL, 107, '[]', '', '15601691200', 1, '', 0, '127.0.0.1', '2021-12-16 09:27:08', '', '2021-01-21 02:13:53', NULL, '2021-12-16 09:27:08', b'0', 1);
+INSERT INTO `sys_user` VALUES (105, 'hradmin', '$2a$10$JEhJOL25X1eMnFfR3PILo.MoAljf29YukpL2w6H9GvVGjmqOCuh.O', 'hr-mgr', 'hr ç®¡ç†å‘˜', 109, '[3]', '', '18818260000', 1, '', 0, '127.0.0.1', '2021-10-30 21:19:36', '1', '2021-09-25 16:50:41', '1', '2021-12-16 09:26:41', b'0', 1);
+INSERT INTO `sys_user` VALUES (106, 'zhijiantianya', '$2a$10$Y0hSfV2udA8quqMeWukhTuHEoKpQ5tDhclG8WUWSOH7o/MGw185Ti', 'èŠ‹é“æºç ', '', NULL, NULL, '', '', 3, 'https://portrait.gitee.com/uploads/avatars/user/0/176_zhijiantianya_1578913741.png', 0, '', NULL, NULL, '2021-09-28 09:40:59', NULL, '2021-12-15 14:44:47', b'1', 1);
 COMMIT;
 -- ----------------------------
@@ -1835,7 +2007,7 @@ INSERT INTO `sys_user_role` VALUES (4, 100, 101, &#39;&#39;, NULL, &#39;&#39;, NULL, b&#39;0&#39;, 0);
 INSERT INTO `sys_user_role` VALUES (5, 100, 1, '', NULL, '', NULL, b'0', 0);
 INSERT INTO `sys_user_role` VALUES (6, 100, 2, '', NULL, '', NULL, b'0', 0);
 INSERT INTO `sys_user_role` VALUES (7, 104, 101, '', NULL, '', NULL, b'0', 0);
-INSERT INTO `sys_user_role` VALUES (8, 106, 1, NULL, '2021-09-28 09:40:59', NULL, '2021-09-28 09:40:59', b'0', 0);
+INSERT INTO `sys_user_role` VALUES (8, 106, 1, NULL, '2021-09-28 09:40:59', NULL, '2021-09-28 09:40:59', b'1', 0);
 INSERT INTO `sys_user_role` VALUES (9, 105, 1, '1', '2021-10-30 13:40:48', '1', '2021-10-30 13:40:48', b'0', 0);
 COMMIT;
@@ -1864,6 +2036,25 @@ CREATE TABLE `sys_user_session` (
 -- Records of sys_user_session
 -- ----------------------------
 BEGIN;
+INSERT INTO `sys_user_session` VALUES ('0180929bb4b244b891253885e86ad9d1', 1, 2, '2021-12-16 09:37:48', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-16 09:07:48', NULL, '2021-12-16 09:07:48', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('01b7469337864db7a9b65747f38fa928', 1, 2, '2021-12-31 14:29:42', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-31 13:49:05', NULL, '2021-12-31 13:59:42', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('0b8545465544481da4d162a3a74a552e', 1, 2, '2021-12-15 23:48:37', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-15 22:44:07', NULL, '2021-12-15 23:18:37', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('1995595036aa4652bb887c43cfd35ba8', 1, 2, '2021-12-31 23:39:16', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-31 22:57:57', NULL, '2021-12-31 23:09:16', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('1b848d99cde6448097dcedc83fda4c0a', 1, 2, '2021-12-31 10:45:09', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-31 08:35:36', NULL, '2021-12-31 10:15:09', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('1bc6ad0827fe48099bcbdb9a206818ac', 104, 2, '2021-12-15 23:48:59', 'test', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-15 23:18:59', NULL, '2021-12-15 23:18:59', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('2ec1ca2d0053415599fa18e6bddf710e', 104, 2, '2021-12-16 10:08:04', 'test', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-16 09:27:08', NULL, '2021-12-16 09:38:04', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('345ad9af8d0c46c8ad285b57cabfd060', 1, 2, '2021-12-25 19:57:51', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-25 19:15:06', NULL, '2021-12-25 19:27:51', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('47949a90a88d4c49823d70995d980ee9', 1, 2, '2021-12-16 10:04:30', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-16 09:20:41', NULL, '2021-12-16 09:34:30', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('495da339c78846609991d9bc66e17dcf', 1, 2, '2021-12-31 22:54:24', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-31 21:47:55', NULL, '2021-12-31 22:24:24', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('4e00d142b22e4826938de31c221b6b32', 104, 2, '2021-12-16 09:54:24', 'test', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-16 09:24:24', NULL, '2021-12-16 01:27:04', b'1', 1);
+INSERT INTO `sys_user_session` VALUES ('64f51e60527349d6b4a0a74f3d8eca97', 104, 2, '2021-12-16 07:37:54', 'test', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-16 07:07:54', NULL, '2021-12-16 07:07:54', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('945e4bb19f4d4c28ba7135218ee3abe3', 1, 2, '2021-12-16 08:28:54', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-16 07:42:25', NULL, '2021-12-16 07:58:54', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('9ee1349d7d3043759cb742a0fa5a3163', 1, 2, '2021-12-25 19:08:33', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-25 18:38:33', NULL, '2021-12-25 18:38:33', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('a155e6dfe4b74fbaa69fcca239facc40', 1, 2, '2021-12-16 07:37:39', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-16 07:07:39', NULL, '2021-12-16 07:07:39', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('a55b31ff9e6a41fcb931d2244b4240a8', 1, 2, '2021-12-30 22:32:56', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-30 20:04:02', NULL, '2021-12-30 22:02:56', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('ab449ce8f2ea456591d23515c188c242', 1, 2, '2021-12-25 17:55:45', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-25 16:42:42', NULL, '2021-12-25 17:25:45', b'0', 1);
+INSERT INTO `sys_user_session` VALUES ('da04f99dc14a4f28a8a77178861cb3ed', 104, 2, '2021-12-15 23:37:58', 'test', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-15 22:47:31', NULL, '2021-12-15 15:11:55', b'1', 1);
+INSERT INTO `sys_user_session` VALUES ('fe82f6ecb17449b595c7d6bd4bc1d371', 1, 2, '2021-12-15 23:16:49', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36', NULL, '2021-12-15 22:46:49', NULL, '2021-12-15 14:46:53', b'1', 1);
 COMMIT;
 -- ----------------------------
@@ -1896,25 +2087,25 @@ CREATE TABLE `tool_codegen_column` (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ˜¯å¦åˆ é™¤',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=479 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='ä»£ç ç”Ÿæˆè¡¨å—æ®µå®šä¹‰';
+) ENGINE=InnoDB AUTO_INCREMENT=489 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='ä»£ç ç”Ÿæˆè¡¨å—æ®µå®šä¹‰';
 -- ----------------------------
 -- Records of tool_codegen_column
 -- ----------------------------
 BEGIN;
-INSERT INTO `tool_codegen_column` VALUES (243, 21, 'id', 'int(5)', 'å‚æ•°ä¸»é”®', b'0', b'1', '1', 1, 'Integer', 'id', '', NULL, b'0', b'1', b'0', '=', b'1', 'input', '', '2021-02-06 19:51:35', '', '2021-02-06 19:51:35', b'0');
-INSERT INTO `tool_codegen_column` VALUES (244, 21, 'group', 'varchar(50)', 'å‚æ•°åˆ†ç»„', b'0', b'0', '0', 2, 'String', 'group', '', NULL, b'1', b'1', b'0', '=', b'1', 'input', '', '2021-02-06 19:51:35', '', '2021-03-06 02:20:02', b'0');
-INSERT INTO `tool_codegen_column` VALUES (245, 21, 'type', 'tinyint(4)', 'å‚æ•°ç±»åž‹', b'0', b'0', '0', 3, 'Integer', 'type', '', NULL, b'1', b'1', b'1', '=', b'1', 'select', '', '2021-02-06 19:51:35', '', '2021-02-06 19:51:35', b'0');
-INSERT INTO `tool_codegen_column` VALUES (246, 21, 'name', 'varchar(100)', 'å‚æ•°åç§°', b'0', b'0', '0', 4, 'String', 'name', '', NULL, b'1', b'1', b'1', 'LIKE', b'1', 'input', '', '2021-02-06 19:51:35', '', '2021-02-06 19:51:35', b'0');
-INSERT INTO `tool_codegen_column` VALUES (247, 21, 'key', 'varchar(100)', 'å‚æ•°é”®å', b'0', b'0', '0', 5, 'String', 'key', '', NULL, b'1', b'1', b'1', '=', b'1', 'input', '', '2021-02-06 19:51:35', '', '2021-02-06 19:51:35', b'0');
-INSERT INTO `tool_codegen_column` VALUES (248, 21, 'value', 'varchar(500)', 'å‚æ•°é”®å€¼', b'0', b'0', '0', 6, 'String', 'value', '', NULL, b'1', b'1', b'0', '=', b'1', 'input', '', '2021-02-06 19:51:35', '', '2021-03-06 02:20:02', b'0');
-INSERT INTO `tool_codegen_column` VALUES (249, 21, 'sensitive', 'bit(1)', 'æ˜¯å¦æ•æ„Ÿ', b'0', b'0', '0', 7, 'Boolean', 'sensitive', '', NULL, b'1', b'1', b'0', '=', b'1', 'radio', '', '2021-02-06 19:51:35', '', '2021-03-06 02:20:02', b'0');
-INSERT INTO `tool_codegen_column` VALUES (250, 21, 'remark', 'varchar(500)', 'å¤‡æ³¨', b'1', b'0', '0', 8, 'String', 'remark', '', NULL, b'1', b'1', b'0', '=', b'1', 'input', '', '2021-02-06 19:51:35', '', '2021-03-06 02:20:02', b'0');
-INSERT INTO `tool_codegen_column` VALUES (251, 21, 'creator', 'varchar(64)', 'åˆ›å»ºè€…', b'1', b'0', '0', 9, 'String', 'createBy', '', NULL, b'0', b'0', b'0', '=', b'0', 'input', '', '2021-02-06 19:51:35', '', '2021-02-06 19:51:35', b'0');
-INSERT INTO `tool_codegen_column` VALUES (252, 21, 'create_time', 'datetime', 'åˆ›å»ºæ—¶é—´', b'0', b'0', '0', 10, 'Date', 'createTime', '', NULL, b'0', b'0', b'1', 'BETWEEN', b'1', 'datetime', '', '2021-02-06 19:51:35', '', '2021-02-06 19:51:35', b'0');
-INSERT INTO `tool_codegen_column` VALUES (253, 21, 'updater', 'varchar(64)', 'æ›´æ–°è€…', b'1', b'0', '0', 11, 'String', 'updateBy', '', NULL, b'0', b'0', b'0', '=', b'0', 'input', '', '2021-02-06 19:51:35', '', '2021-02-06 19:51:35', b'0');
-INSERT INTO `tool_codegen_column` VALUES (254, 21, 'update_time', 'datetime', 'æ›´æ–°æ—¶é—´', b'0', b'0', '0', 12, 'Date', 'updateTime', '', NULL, b'0', b'0', b'0', 'BETWEEN', b'0', 'datetime', '', '2021-02-06 19:51:35', '', '2021-02-06 19:51:35', b'0');
-INSERT INTO `tool_codegen_column` VALUES (255, 21, 'deleted', 'bit(1)', 'æ˜¯å¦åˆ é™¤', b'0', b'0', '0', 13, 'Boolean', 'deleted', '', NULL, b'0', b'0', b'0', '=', b'0', 'radio', '', '2021-02-06 19:51:35', '', '2021-02-06 19:51:35', b'0');
+INSERT INTO `tool_codegen_column` VALUES (243, 21, 'id', 'int(5)', 'å‚æ•°ä¸»é”®', b'0', b'1', '1', 1, 'Integer', 'id', '', NULL, b'0', b'1', b'0', '=', b'1', 'input', '', '2021-02-06 19:51:35', '1', '2021-12-31 22:06:46', b'0');
+INSERT INTO `tool_codegen_column` VALUES (244, 21, 'group', 'varchar(50)', 'å‚æ•°åˆ†ç»„', b'0', b'0', '0', 2, 'String', 'group', '', NULL, b'1', b'1', b'0', '=', b'1', 'input', '', '2021-02-06 19:51:35', '1', '2021-12-31 22:06:46', b'0');
+INSERT INTO `tool_codegen_column` VALUES (245, 21, 'type', 'tinyint(4)', 'å‚æ•°ç±»åž‹', b'0', b'0', '0', 3, 'Integer', 'type', '', NULL, b'1', b'1', b'1', '=', b'1', 'select', '', '2021-02-06 19:51:35', '1', '2021-12-31 22:06:46', b'0');
+INSERT INTO `tool_codegen_column` VALUES (246, 21, 'name', 'varchar(100)', 'å‚æ•°åç§°', b'0', b'0', '0', 4, 'String', 'name', '', NULL, b'1', b'1', b'1', 'LIKE', b'1', 'input', '', '2021-02-06 19:51:35', '1', '2021-12-31 22:06:46', b'0');
+INSERT INTO `tool_codegen_column` VALUES (247, 21, 'key', 'varchar(100)', 'å‚æ•°é”®å', b'0', b'0', '0', 5, 'String', 'key', '', NULL, b'1', b'1', b'1', '=', b'1', 'input', '', '2021-02-06 19:51:35', '1', '2021-12-31 22:06:46', b'0');
+INSERT INTO `tool_codegen_column` VALUES (248, 21, 'value', 'varchar(500)', 'å‚æ•°é”®å€¼', b'0', b'0', '0', 6, 'String', 'value', '', NULL, b'1', b'1', b'0', '=', b'1', 'input', '', '2021-02-06 19:51:35', '1', '2021-12-31 22:06:46', b'0');
+INSERT INTO `tool_codegen_column` VALUES (249, 21, 'sensitive', 'bit(1)', 'æ˜¯å¦æ•æ„Ÿ', b'0', b'0', '0', 7, 'Boolean', 'sensitive', '', NULL, b'1', b'1', b'0', '=', b'1', 'radio', '', '2021-02-06 19:51:35', '1', '2021-12-31 22:06:46', b'0');
+INSERT INTO `tool_codegen_column` VALUES (250, 21, 'remark', 'varchar(500)', 'å¤‡æ³¨', b'1', b'0', '0', 8, 'String', 'remark', '', NULL, b'1', b'1', b'0', '=', b'1', 'input', '', '2021-02-06 19:51:35', '1', '2021-12-31 22:06:46', b'0');
+INSERT INTO `tool_codegen_column` VALUES (251, 21, 'creator', 'varchar(64)', 'åˆ›å»ºè€…', b'1', b'0', '0', 9, 'String', 'createBy', '', NULL, b'0', b'0', b'0', '=', b'0', 'input', '', '2021-02-06 19:51:35', '1', '2021-12-31 22:06:46', b'0');
+INSERT INTO `tool_codegen_column` VALUES (252, 21, 'create_time', 'datetime', 'åˆ›å»ºæ—¶é—´', b'0', b'0', '0', 10, 'Date', 'createTime', '', NULL, b'0', b'0', b'1', 'BETWEEN', b'1', 'datetime', '', '2021-02-06 19:51:35', '1', '2021-12-31 22:06:46', b'0');
+INSERT INTO `tool_codegen_column` VALUES (253, 21, 'updater', 'varchar(64)', 'æ›´æ–°è€…', b'1', b'0', '0', 11, 'String', 'updateBy', '', NULL, b'0', b'0', b'0', '=', b'0', 'input', '', '2021-02-06 19:51:35', '1', '2021-12-31 22:06:46', b'0');
+INSERT INTO `tool_codegen_column` VALUES (254, 21, 'update_time', 'datetime', 'æ›´æ–°æ—¶é—´', b'0', b'0', '0', 12, 'Date', 'updateTime', '', NULL, b'0', b'0', b'0', 'BETWEEN', b'0', 'datetime', '', '2021-02-06 19:51:35', '1', '2021-12-31 22:06:46', b'0');
+INSERT INTO `tool_codegen_column` VALUES (255, 21, 'deleted', 'bit(1)', 'æ˜¯å¦åˆ é™¤', b'0', b'0', '0', 13, 'Boolean', 'deleted', '', NULL, b'0', b'0', b'0', '=', b'0', 'radio', '', '2021-02-06 19:51:35', '1', '2021-12-31 22:06:46', b'0');
 INSERT INTO `tool_codegen_column` VALUES (269, 24, 'id', 'bigint(20)', 'ä»»åŠ¡ç¼–å·', b'0', b'1', '1', 1, 'Long', 'id', '', '1024', b'0', b'1', b'0', '=', b'1', 'input', '', '2021-02-07 06:39:34', '', '2021-02-07 06:44:19', b'0');
 INSERT INTO `tool_codegen_column` VALUES (270, 24, 'name', 'varchar(32)', 'ä»»åŠ¡åç§°', b'0', b'0', '0', 2, 'String', 'name', '', 'æµ‹è¯•ä»»åŠ¡', b'1', b'1', b'1', 'LIKE', b'1', 'input', '', '2021-02-07 06:39:34', '', '2021-02-07 06:44:19', b'0');
 INSERT INTO `tool_codegen_column` VALUES (271, 24, 'status', 'tinyint(4)', 'ä»»åŠ¡çŠ¶æ€', b'0', b'0', '0', 3, 'Integer', 'status', 'inf_job_status', '1', b'0', b'0', b'1', '=', b'1', 'radio', '', '2021-02-07 06:39:34', '', '2021-02-07 07:55:17', b'0');
@@ -2114,6 +2305,16 @@ INSERT INTO `tool_codegen_column` VALUES (475, 39, &#39;create_time&#39;, &#39;datetime&#39;, &#39;å
 INSERT INTO `tool_codegen_column` VALUES (476, 39, 'updater', 'varchar(64)', 'æ›´æ–°è€…', b'1', b'0', '0', 8, 'String', 'updater', '', NULL, b'0', b'0', b'0', '=', b'0', 'input', '1', '2021-12-14 09:51:12', '1', '2021-12-14 10:02:12', b'0');
 INSERT INTO `tool_codegen_column` VALUES (477, 39, 'update_time', 'datetime', 'æ›´æ–°æ—¶é—´', b'0', b'0', '0', 9, 'Date', 'updateTime', '', NULL, b'0', b'0', b'0', 'BETWEEN', b'0', 'datetime', '1', '2021-12-14 09:51:12', '1', '2021-12-14 10:02:12', b'0');
 INSERT INTO `tool_codegen_column` VALUES (478, 39, 'deleted', 'bit(1)', 'æ˜¯å¦åˆ é™¤', b'0', b'0', '0', 10, 'Boolean', 'deleted', '', NULL, b'0', b'0', b'0', '=', b'0', 'radio', '1', '2021-12-14 09:51:12', '1', '2021-12-14 10:02:12', b'0');
+INSERT INTO `tool_codegen_column` VALUES (479, 40, 'id', 'bigint', 'ç¼–å·', b'0', b'1', '1', 1, 'Long', 'id', '', NULL, b'0', b'1', b'0', '=', b'1', 'input', '1', '2021-12-30 20:33:27', '1', '2021-12-30 20:37:58', b'0');
+INSERT INTO `tool_codegen_column` VALUES (480, 40, 'name', 'varchar(64)', 'è¡¨å•å', b'0', b'0', '0', 2, 'String', 'name', '', NULL, b'1', b'1', b'1', 'LIKE', b'1', 'input', '1', '2021-12-30 20:33:27', '1', '2021-12-30 20:37:58', b'0');
+INSERT INTO `tool_codegen_column` VALUES (481, 40, 'status', 'tinyint', 'å¼€å¯çŠ¶æ€', b'0', b'0', '0', 3, 'Integer', 'status', 'sys_common_status', NULL, b'1', b'1', b'0', '=', b'1', 'radio', '1', '2021-12-30 20:33:27', '1', '2021-12-30 20:37:58', b'0');
+INSERT INTO `tool_codegen_column` VALUES (482, 40, 'fields', 'varchar(1024)', 'è¡¨å•é…ç½®', b'0', b'0', '0', 4, 'String', 'fields', '', NULL, b'1', b'1', b'0', '=', b'1', 'input', '1', '2021-12-30 20:33:27', '1', '2021-12-30 20:37:58', b'0');
+INSERT INTO `tool_codegen_column` VALUES (483, 40, 'remark', 'varchar(255)', 'å¤‡æ³¨', b'1', b'0', '0', 5, 'String', 'remark', '', NULL, b'1', b'1', b'0', '=', b'1', 'input', '1', '2021-12-30 20:33:27', '1', '2021-12-30 20:37:58', b'0');
+INSERT INTO `tool_codegen_column` VALUES (484, 40, 'creator', 'varchar(64)', 'åˆ›å»ºè€…', b'1', b'0', '0', 6, 'String', 'creator', '', NULL, b'0', b'0', b'0', '=', b'0', 'input', '1', '2021-12-30 20:33:27', '1', '2021-12-30 20:37:58', b'0');
+INSERT INTO `tool_codegen_column` VALUES (485, 40, 'create_time', 'datetime', 'åˆ›å»ºæ—¶é—´', b'0', b'0', '0', 7, 'Date', 'createTime', '', NULL, b'0', b'0', b'0', 'BETWEEN', b'1', 'datetime', '1', '2021-12-30 20:33:27', '1', '2021-12-30 20:37:58', b'0');
+INSERT INTO `tool_codegen_column` VALUES (486, 40, 'updater', 'varchar(64)', 'æ›´æ–°è€…', b'1', b'0', '0', 8, 'String', 'updater', '', NULL, b'0', b'0', b'0', '=', b'0', 'input', '1', '2021-12-30 20:33:27', '1', '2021-12-30 20:37:58', b'0');
+INSERT INTO `tool_codegen_column` VALUES (487, 40, 'update_time', 'datetime', 'æ›´æ–°æ—¶é—´', b'0', b'0', '0', 9, 'Date', 'updateTime', '', NULL, b'0', b'0', b'0', 'BETWEEN', b'0', 'datetime', '1', '2021-12-30 20:33:27', '1', '2021-12-30 20:37:58', b'0');
+INSERT INTO `tool_codegen_column` VALUES (488, 40, 'deleted', 'bit(1)', 'æ˜¯å¦åˆ é™¤', b'0', b'0', '0', 10, 'Boolean', 'deleted', '', NULL, b'0', b'0', b'0', '=', b'0', 'radio', '1', '2021-12-30 20:33:27', '1', '2021-12-30 20:37:58', b'0');
 COMMIT;
 -- ----------------------------
@@ -2139,13 +2340,13 @@ CREATE TABLE `tool_codegen_table` (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT 'æ˜¯å¦åˆ é™¤',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=40 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='ä»£ç ç”Ÿæˆè¡¨å®šä¹‰';
+) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='ä»£ç ç”Ÿæˆè¡¨å®šä¹‰';
 -- ----------------------------
 -- Records of tool_codegen_table
 -- ----------------------------
 BEGIN;
-INSERT INTO `tool_codegen_table` VALUES (21, 1, 'inf_config', 'å‚æ•°é…ç½®è¡¨', NULL, 'infra', 'config', 'InfConfig', 'å‚æ•°é…ç½®', 'èŠ‹è‰¿', 1, NULL, '', '2021-02-06 19:51:35', '', '2021-02-06 19:51:35', b'0');
+INSERT INTO `tool_codegen_table` VALUES (21, 1, 'inf_config', 'å‚æ•°é…ç½®è¡¨', NULL, 'infra', 'config', 'InfConfig', 'å‚æ•°é…ç½®', 'èŠ‹è‰¿', 1, NULL, '', '2021-02-06 19:51:35', '1', '2021-12-31 22:06:46', b'0');
 INSERT INTO `tool_codegen_table` VALUES (22, 2, 'sys_file', 'æ–‡ä»¶è¡¨\n', NULL, 'system', 'file', 'SysFile', 'æ–‡ä»¶', 'èŠ‹è‰¿', 1, NULL, '', '2021-02-06 20:28:34', '', '2021-02-06 20:28:34', b'0');
 INSERT INTO `tool_codegen_table` VALUES (24, 1, 'inf_job', 'å®šæ—¶ä»»åŠ¡è¡¨', NULL, 'infra', 'job', 'InfJob', 'å®šæ—¶ä»»åŠ¡', 'èŠ‹é“æºç ', 1, NULL, '', '2021-02-07 06:39:34', '', '2021-02-07 06:46:56', b'0');
 INSERT INTO `tool_codegen_table` VALUES (25, 1, 'inf_job_log', 'å®šæ—¶ä»»åŠ¡æ—¥å¿—è¡¨', NULL, 'infra', 'jobLog', 'InfJobLog', 'å®šæ—¶ä»»åŠ¡', 'èŠ‹è‰¿', 1, NULL, '', '2021-02-08 04:58:41', '', '2021-02-08 10:09:52', b'0');
@@ -2160,6 +2361,7 @@ INSERT INTO `tool_codegen_table` VALUES (36, 1, &#39;sys_sms_log&#39;, &#39;çŸä¿¡æ—¥å¿—&#39;, N
 INSERT INTO `tool_codegen_table` VALUES (37, 1, 'inf_error_code', 'é”™è¯¯ç è¡¨', NULL, 'infra', 'errorcode', 'InfErrorCode', 'é”™è¯¯ç ', 'èŠ‹é“æºç ', 1, 2, '1', '2021-04-20 15:27:45', '1', '2021-04-21 00:55:37', b'0');
 INSERT INTO `tool_codegen_table` VALUES (38, 1, 'tool_test_demo', 'å—å…¸ç±»åž‹è¡¨', NULL, 'tool', 'test', 'ToolTestDemo', 'å—å…¸ç±»åž‹', 'èŠ‹è‰¿', 1, NULL, '1', '2021-04-26 12:25:51', '1', '2021-05-03 00:45:45', b'0');
 INSERT INTO `tool_codegen_table` VALUES (39, 1, 'sys_tenant', 'ç§Ÿæˆ·è¡¨', NULL, 'system', 'tenant', 'SysTenant', 'ç§Ÿæˆ·', 'èŠ‹é“æºç ', 1, 1, '1', '2021-12-05 01:04:21', '1', '2021-12-14 10:02:12', b'0');
+INSERT INTO `tool_codegen_table` VALUES (40, 1, 'bpm_form', 'å·¥ä½œæµçš„è¡¨å•å®šä¹‰', NULL, 'bpm', 'form', 'BpmForm', 'å·¥ä½œæµçš„', 'èŠ‹é“æºç ', 1, 1186, '1', '2021-12-30 12:32:54', '1', '2021-12-30 20:37:58', b'0');
 COMMIT;
 -- ----------------------------
@@ -30,6 +30,7 @@ public interface BpmErrorCodeConstants {
     ErrorCode BPMN_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1004001004, "流程定义不存在");
     // ========== 动态表单模块 1-003-003-000 ==========
-    ErrorCode BPM_FORM_NOT_EXISTS = new ErrorCode(1003001002, "动态表单不存在");
+    ErrorCode BPM_FORM_NOT_EXISTS = new ErrorCode(1003003000, "动态表单不存在");
+    ErrorCode BPM_FORM_FIELD_REPEAT = new ErrorCode(1003003000, "表单项({}) 和 ({}) 使用了相同的字段名({})");
 }
+package cn.iocoder.yudao.adminserver.modules.bpm.service.form.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * Bpm 表单的 Field 表单项 Response DTO
+ * 字段的定义，可见 https://github.com/JakHuang/form-generator/issues/46 文档
+ *
+ * @author 芋道源码
+ */
+@Data
+public class BpmFormFieldRespDTO {
+
+    /**
+     * 表单标题
+     */
+    private String label;
+    /**
+     * 表单字段的属性名，可自定义
+     */
+    @JsonProperty(value = "vModel")
+    private String vModel;
+
+}
 package cn.iocoder.yudao.adminserver.modules.bpm.service.form.impl;
+import cn.hutool.core.lang.Assert;
 import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormCreateReqVO;
 import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormPageReqVO;
 import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormUpdateReqVO;
@@ -7,14 +8,19 @@ import cn.iocoder.yudao.adminserver.modules.bpm.convert.form.BpmFormConvert;
 import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form.BpmFormDO;
 import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.form.BpmFormMapper;
 import cn.iocoder.yudao.adminserver.modules.bpm.service.form.BpmFormService;
+import cn.iocoder.yudao.adminserver.modules.bpm.service.form.dto.BpmFormFieldRespDTO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.BPM_FORM_FIELD_REPEAT;
 import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.BPM_FORM_NOT_EXISTS;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -32,6 +38,7 @@ public class BpmFormServiceImpl implements BpmFormService {
     @Override
     public Long createForm(BpmFormCreateReqVO createReqVO) {
+        this.checkFields(createReqVO.getFields());
         // 插入
         BpmFormDO form = BpmFormConvert.INSTANCE.convert(createReqVO);
         formMapper.insert(form);
@@ -41,6 +48,7 @@ public class BpmFormServiceImpl implements BpmFormService {
     @Override
     public void updateForm(BpmFormUpdateReqVO updateReqVO) {
+        this.checkFields(updateReqVO.getFields());
         // 校验存在
         this.validateFormExists(updateReqVO.getId());
         // 更新
@@ -77,4 +85,24 @@ public class BpmFormServiceImpl implements BpmFormService {
         return formMapper.selectPage(pageReqVO);
     }
+    /**
+     * 校验 Field，避免 field 重复
+     *
+     * @param fields field 数组
+     */
+    private void checkFields(List<String> fields) {
+        Map<String, String> fieldMap = new HashMap<>(); // key 是 vModel，value 是 label
+        for (String field : fields) {
+            BpmFormFieldRespDTO fieldDTO = JsonUtils.parseObject(field, BpmFormFieldRespDTO.class);
+            Assert.notNull(fieldDTO);
+            String oldLabel = fieldMap.put(fieldDTO.getVModel(), fieldDTO.getLabel());
+            // 如果不存在，则直接返回
+            if (oldLabel == null) {
+                continue;
+            }
+            // 如果存在，则报错
+            throw exception(BPM_FORM_FIELD_REPEAT, oldLabel, fieldDTO.getLabel(), fieldDTO.getVModel());
+        }
+    }
+
 }
@@ -118,7 +118,7 @@ export default {
   data() {
     return {
       // logo,
-      idGlobal: 100,
+      idGlobal: 100, // 自动 ID 生成时，全局递增。例如说 field100
       formConf, // 表单格式
       inputComponents,
       selectComponents,
@@ -128,7 +128,7 @@ export default {
       drawingData: {}, // 生成后的表单数据
       drawingList: [], // 表单项的数组
-      activeId: 0,
+      activeId: undefined,
       activeData: {},
       // drawerVisible: false,
       // formData: {},
@@ -179,6 +179,8 @@ export default {
         }
         this.formConf = JSON.parse(data.conf)
         this.drawingList = this.decodeFields(data.fields)
+        // 设置 idGlobal，避免重复
+        this.idGlobal += this.drawingList.length
       });
     }
   },