1487 Commits

Author SHA1 Message Date
cdb12bc9e0 权限 2024-05-27 14:49:35 +08:00
988880265c Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
# Conflicts:
#	src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java
2024-05-27 14:45:56 +08:00
3c59d123f4 日志 2024-05-27 14:24:38 +08:00
374457baf5 车辆调整 2024-05-27 14:00:54 +08:00
7a2b8f47fe 日志 2024-05-27 13:43:50 +08:00
7f5e9aaa1e 车辆调整 2024-05-27 13:28:32 +08:00
f8c29798f9 企业人员占比 2024-05-27 11:34:25 +08:00
456ffe1b70 改字 2024-05-27 10:23:05 +08:00
9a51dad438 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-26 11:41:45 +08:00
8ed205a4ea 车辆调整 2024-05-26 11:41:19 +08:00
GUO
8b94230d78 bug修复 2024-05-26 00:56:13 +08:00
GUO
8abd1df9b8 join做数据权限 2024-05-26 00:52:32 +08:00
5c1c4d0e72 材料调整 2024-05-25 23:40:04 +08:00
GUO
7af30c9128 安全围栏加区域字段 2024-05-25 23:24:43 +08:00
9b15682cba Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-25 22:36:58 +08:00
a2ca7e1351 材料调整 2024-05-25 22:05:38 +08:00
335232416a Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-25 21:51:57 +08:00
GUO
a6674264c4 安全围栏加区域字段 2024-05-25 21:49:29 +08:00
1c3a62827b 任务做权限 2024-05-25 18:30:12 +08:00
efbf57c142 测试权限 2024-05-25 18:29:51 +08:00
75333c2b8c ai预警的推送 2024-05-25 17:43:40 +08:00
fc06d493b5 安全和质量记录的导出 2024-05-25 17:43:28 +08:00
915422a8d3 ai推送相应的人 2024-05-25 15:56:29 +08:00
3ba4de4414 打印日志 2024-05-25 14:01:30 +08:00
bfdb6c6977 VR安全体验和安全宝接口 2024-05-25 13:47:44 +08:00
dbee0f9d41 打印日志 2024-05-25 10:18:50 +08:00
07e1da5ea2 安全和质量导出bug修改 2024-05-25 10:18:41 +08:00
ec00346349 移动巡检目录 2024-05-24 23:59:48 +08:00
e9672899ec 巡检权限 2024-05-24 23:57:49 +08:00
GUO
304159b895 新增巡检的通知人修改 2024-05-24 23:02:46 +08:00
3ec27449ec Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-24 22:57:14 +08:00
85d6b6094c 导出人员二维码 2024-05-24 22:56:44 +08:00
f100ff9cc4 巡检路线 2024-05-24 22:56:27 +08:00
7d51034160 人员和教育培训修改 2024-05-24 19:58:31 +08:00
4d878071d7 人员和教育培训修改 2024-05-24 18:40:16 +08:00
39fa7a56fd 人员和教育培训修改 2024-05-24 18:28:14 +08:00
a546bb7fcf 人员和教育培训修改 2024-05-24 17:59:19 +08:00
2702f5975b 人员和教育培训修改 2024-05-24 17:24:36 +08:00
66fd160ae2 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-24 16:55:52 +08:00
a0ce911a58 打日志 2024-05-24 16:40:35 +08:00
753ca35894 安全履职的从职务取值 2024-05-24 16:40:22 +08:00
b18a660601 bug修复 2024-05-24 14:58:41 +08:00
f7669c0d40 bug修改 2024-05-24 14:50:19 +08:00
7ecc95cebe 劳务人员根据身份证号和名称登录提示修改 2024-05-24 14:48:39 +08:00
7cf26f51e0 jeecg模版修改 2024-05-24 09:23:22 +08:00
81104a72b2 bug修改 2024-05-24 00:24:24 +08:00
333d8ea034 bug修改 2024-05-23 23:44:11 +08:00
0f2d08e1dc bug修改 2024-05-23 23:27:51 +08:00
5515b91376 bug修改 2024-05-23 22:34:39 +08:00
d67e2203eb bug修改 2024-05-23 22:31:10 +08:00