Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
sxu 2024-11-11 10:23:08 +08:00
commit 2c90f1da4f
8 changed files with 52 additions and 3 deletions

View File

@ -1,4 +1,13 @@
ALTER TABLE `ma_sgzb`.`data_receive_detail` ALTER TABLE `ma_sgzb`.`data_receive_detail`
ADD COLUMN `item_id` bigint NULL COMMENT '租赁商城装备id' AFTER `status`; ADD COLUMN `item_id` bigint NULL COMMENT '租赁商城装备id' AFTER `status`;
INSERT INTO `ma_sgzb`.`sys_dic` ( `p_id`, `code`, `name`, `description`, `value`, `sort`, `level`, `status`, `create_time`, `creator`) VALUES ( 13, NULL, '已退租', NULL, NULL, NULL, '2', '0', NULL, NULL); INSERT INTO `ma_sgzb`.`sys_dic` ( `p_id`, `code`, `name`, `description`, `value`, `sort`, `level`, `status`, `create_time`, `creator`) VALUES ( 13, NULL, '已退租', NULL, NULL, NULL, '2', '0', NULL, NULL);
ALTER TABLE `ma_sgzb`.`data_receive_detail`
ADD COLUMN `order_over_time` datetime NULL COMMENT '租赁到期时间' AFTER `item_id`,
ADD COLUMN `ma_user_phone` varchar(255) NULL COMMENT '机手电话' AFTER `order_over_time`,
ADD COLUMN `ma_user_id_card` varchar(255) NULL COMMENT '机手身份证号' AFTER `ma_user_phone`,
ADD COLUMN `ma_user_sex` tinyint NULL COMMENT '机手性别(0女 1男)' AFTER `ma_user_id_card`,
ADD COLUMN `ma_user_age` int NULL COMMENT '机手年龄' AFTER `ma_user_sex`,
ADD COLUMN `machine_name` varchar(255) NULL COMMENT '机具名称' AFTER `ma_user_age`;

View File

@ -0,0 +1,8 @@
CREATE TABLE `enterprise_driver_file` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`receive_detail_id` bigint(20) NOT NULL COMMENT '推送详情id',
`file_name` varchar(200) DEFAULT NULL COMMENT '附件名称',
`file_url` varchar(200) NOT NULL COMMENT '附件地址',
`file_type` tinyint(4) NOT NULL COMMENT '附件类型0反面1正面2持证信息',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='机手附件信息表';

View File

@ -0,0 +1,14 @@
ALTER TABLE `ma_sgzb`.`data_receive_detail`
ADD COLUMN `item_id` bigint NULL COMMENT '租赁商城装备id' AFTER `status`;
INSERT INTO `ma_sgzb`.`sys_dic` ( `p_id`, `code`, `name`, `description`, `value`, `sort`, `level`, `status`, `create_time`, `creator`) VALUES ( 13, NULL, '已退租', NULL, NULL, NULL, '2', '0', NULL, NULL);
ALTER TABLE `ma_sgzb`.`data_receive_detail`
ADD COLUMN `order_over_time` datetime NULL COMMENT '租赁到期时间' AFTER `item_id`,
ADD COLUMN `ma_user_phone` varchar(255) NULL COMMENT '机手电话' AFTER `order_over_time`,
ADD COLUMN `ma_user_id_card` varchar(255) NULL COMMENT '机手身份证号' AFTER `ma_user_phone`,
ADD COLUMN `ma_user_sex` tinyint NULL COMMENT '机手性别(0女 1男)' AFTER `ma_user_id_card`,
ADD COLUMN `ma_user_age` int NULL COMMENT '机手年龄' AFTER `ma_user_sex`,
ADD COLUMN `machine_name` varchar(255) NULL COMMENT '机具名称' AFTER `ma_user_age`;

View File

@ -0,0 +1,8 @@
CREATE TABLE `enterprise_driver_file` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`receive_detail_id` bigint(20) NOT NULL COMMENT '推送详情id',
`file_name` varchar(200) DEFAULT NULL COMMENT '附件名称',
`file_url` varchar(200) NOT NULL COMMENT '附件地址',
`file_type` tinyint(4) NOT NULL COMMENT '附件类型0反面1正面2持证信息',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='机手附件信息表';

View File

@ -1,2 +0,0 @@
--xxx

View File

@ -0,0 +1,3 @@
--xxx
ALTER TABLE `ma_sgzb`.`ma_machine`
ADD COLUMN `push_status` int NULL DEFAULT 0 COMMENT '推送到租赁标识0未推送 1推送' AFTER `phone`;

View File

@ -0,0 +1,6 @@
--xxx
INSERT INTO `service_user`.`resource` (`platform_id`, `type`, `name`, `pid`, `system_default`, `url`, `level`, `owner`, `order_num`, `created`, `updated`, `yn`, `code`, `icon`, `target`, `html_code`, `status`, `route_url`) VALUES ( 20, 'menu', '仓储推送装备管理', 3000077, 0, '#/shop-view/goods/push-device-management', 2, 'seller', 5, '2022-05-05 10:21:42', NULL, 1, 3000084, NULL, '1', '1', 1, NULL);
--sql获取resource_id
INSERT INTO `service_user`.`role_resource` ( `platform_id`, `role_id`, `resource_id`, `created`, `updated`, `yn`) VALUES (20, 744, , '2024-07-11 09:38:20', NULL, 1);

View File

@ -0,0 +1,3 @@
--xxx
ALTER TABLE `ma_sgzb`.`ma_machine`
ADD COLUMN `push_status` int NULL DEFAULT 0 COMMENT '推送到租赁标识0未推送 1推送' AFTER `phone`;