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

This commit is contained in:
liang.chao 2024-08-16 10:38:41 +08:00
commit 9d613dcfc6
3 changed files with 41 additions and 2 deletions

View File

@ -11,7 +11,7 @@ create table project_month_costs
id int auto_increment comment '主键id' id int auto_increment comment '主键id'
primary key, primary key,
agreement_id int null comment '协议id', agreement_id int null comment '协议id',
slt_month_id int null comment '结算记录关联id', task_id int not null comment '结算记录关联taskId',
unit_id int null comment '单位id', unit_id int null comment '单位id',
project_id int null comment '工程id', project_id int null comment '工程id',
month varchar(255) null comment '结算月份', month varchar(255) null comment '结算月份',

View File

@ -0,0 +1,39 @@
/*
Navicat Premium Data Transfer
Source Server : 192.168.0.14-prod_rental
Source Server Type : MySQL
Source Server Version : 80200
Source Host : 192.168.0.14:2009
Source Schema : ma_sgzb_nw
Target Server Type : MySQL
Target Server Version : 80200
File Encoding : 65001
Date: 16/08/2024 09:19:12
*/
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for report_alarm
-- ----------------------------
DROP TABLE IF EXISTS `report_alarm`;
CREATE TABLE `report_alarm` (
`id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
`iot_code` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT 'iot设备编码',
`device_alarm_id` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '记录的uuid 唯一确定这一条记录',
`start_alarm` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '报警内容',
`start_alarm_time` datetime NULL DEFAULT NULL COMMENT '报警时间',
`whether_push` int UNSIGNED NULL DEFAULT 0 COMMENT '是否推送 0:否1:是',
`whether_verify` int UNSIGNED NULL DEFAULT 0 COMMENT '是否核实 0:否1:是',
`verify_situation` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '核实情况',
`verify_by` bigint NULL DEFAULT NULL COMMENT '核实人',
`verify_time` datetime NULL DEFAULT NULL COMMENT '核实时间',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `nw_device_alarm_id`(`device_alarm_id` ASC) USING BTREE COMMENT '报警id\r\n'
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '报警处理表' ROW_FORMAT = Dynamic;
SET FOREIGN_KEY_CHECKS = 1;

View File

@ -11,7 +11,7 @@ create table project_month_costs
id int auto_increment comment '主键id' id int auto_increment comment '主键id'
primary key, primary key,
agreement_id int null comment '协议id', agreement_id int null comment '协议id',
slt_month_id int null comment '结算记录关联id', task_id int not null comment '结算记录关联taskId',
unit_id int null comment '单位id', unit_id int null comment '单位id',
project_id int null comment '工程id', project_id int null comment '工程id',
month varchar(255) null comment '结算月份', month varchar(255) null comment '结算月份',