Commit Graph

266 Commits

Author SHA1 Message Date
huangzj
605fe4ee9a Merge branch 'master' of http://192.168.1.13:3000/root/pqs 2023-01-17 16:00:13 +08:00
61c0a100a4 代码合并终端模块 2023-01-17 15:37:50 +08:00
huangzj
7eedfbbbba 修改sql bug 2023-01-17 15:21:46 +08:00
0949b1ee34 代码合并终端模块 2023-01-17 13:47:32 +08:00
9b9ab96582 代码合并谐波 2023-01-17 13:37:40 +08:00
9e42ad84fa pms过程监督代码合并 2023-01-13 15:21:47 +08:00
7d946b646c pms过程监督代码合并 2023-01-13 13:29:54 +08:00
2b08dcb1ec pms代码合并 2023-01-13 10:24:47 +08:00
f6dfee86e6 pms代码合并 2023-01-13 09:37:30 +08:00
06dba45f26 pms代码合并 2023-01-13 09:33:58 +08:00
c4a490d6e7 pms代码合并 2023-01-13 09:29:26 +08:00
a3e782cb36 job代码提交 2023-01-12 16:57:31 +08:00
64259688f4 预处理模块代码合并 2023-01-12 12:15:58 +08:00
f444731599 预处理模块代码合并 2023-01-12 12:15:22 +08:00
2b6091846c 预处理模块代码合拼 2023-01-12 11:53:21 +08:00
a3a3b238d9 预处理模块代码合拼 2023-01-12 11:47:50 +08:00
bc7deab760 预处理模块代码合拼 2023-01-12 11:44:44 +08:00
huangzj
de08816b36 新增查询挡墙部门直属下级部门(没有下级部门返回当前部门)接口 2023-01-11 10:48:31 +08:00
hanyong
81bb7c6468 新增枚举 2023-01-11 08:44:49 +08:00
3bc9bfca56 pms台区新增电压等级字段 2023-01-10 10:51:08 +08:00
hanyong
61924b558e 新增枚举 2023-01-09 15:50:22 +08:00
865cdc97d6 pms台账新增校验 2023-01-09 11:46:47 +08:00
huangzj
44390529b4 Merge remote-tracking branch 'pqs-process-boot-dev/master' 2023-01-09 09:09:15 +08:00
huangzj
5f7fc00475 删除多余物件
Signed-off-by: huangzj <826100833@qq.com>
2023-01-06 15:54:32 +08:00
huangzj
db6a5d49f3 下载时添加文件名 2023-01-06 15:51:54 +08:00
d778e16165 添加部门接口 2023-01-06 15:14:09 +08:00
hanyong
f2851d2a97 新增枚举 2023-01-05 09:36:03 +08:00
hanyong
14533c7e1c 新增枚举 2023-01-03 11:07:25 +08:00
92b8bd1b6d Merge remote-tracking branch 'origin/master' 2023-01-03 11:06:14 +08:00
71d213b6a2 合并代码 2023-01-03 11:05:59 +08:00
cdc6255d22 代码合并 2023-01-03 09:00:20 +08:00
7c4cef74e7 代码调整 2022-12-27 15:51:37 +08:00
97e18b59cf 合并代码 2022-12-26 10:18:46 +08:00
5df53ce872 合并代码 2022-12-19 10:33:53 +08:00
a16f573eae 合并代码 2022-12-15 14:00:44 +08:00
339cf9c75e 合并代码 2022-12-15 10:36:12 +08:00
hanyong
c43b64faa5 新增枚举 2022-12-15 10:24:38 +08:00
e76273e592 代码调整 2022-12-15 10:19:43 +08:00
730c08098b 代码调整 2022-12-13 09:31:58 +08:00
d043ab478b 代码调整 2022-12-12 15:18:48 +08:00
huangzj
1e11335a5c 普测计划模块联调修改 2022-12-12 08:56:05 +08:00
9b8af7945a 合并代码 2022-12-08 18:58:51 +08:00
qijian
a1861c7599 干扰源功能 2022-12-08 18:28:22 +08:00
0615189afe Merge remote-tracking branch 'origin/master' 2022-12-07 17:38:44 +08:00
115275c2ca 部门代码调整 2022-12-07 17:38:19 +08:00
60c2779fe0 合并代码 2022-12-07 10:52:13 +08:00
huangzj
f9733d0fe1 普测计划模块联调修改 2022-12-06 15:36:15 +08:00
cdf75aaea1 部门代码调整 2022-12-06 10:12:36 +08:00
hanyong
8f49a4eefd 新增枚举 2022-12-05 15:43:23 +08:00
hanyong
43ea569d1d 新增枚举 2022-12-02 14:10:57 +08:00