2092 Commits

Author SHA1 Message Date
骆乐
ef285b0caa Merge branch 'master' into dev-xiaole 2022-07-04 13:58:05 +08:00
骆乐
823769e6c0 logo 2022-07-04 13:51:19 +08:00
31a0974e7f Merge branch 'dev-xiaomi' into 'master'
Dev xiaomi

See merge request !27
2022-07-02 19:02:49 +08:00
骆乐
14da9285c0 一键下发 2022-07-02 18:56:35 +08:00
Luck-Xiaomi
dc8bc65527 Merge branch 'master' of http://139.9.66.234:18023/dhp/zhgdyun into dev-xiaomi 2022-07-01 10:42:32 +08:00
Luck-Xiaomi
34d57b91c4 优化星璇已知问题 2022-07-01 10:39:23 +08:00
骆乐
7e125332ed Merge branch 'master' into dev-xiaole 2022-06-30 17:44:13 +08:00
骆乐
efc0b77542 修复发放到外部 2022-06-30 17:42:32 +08:00
f9f235a7d3 Merge branch 'dev-gmj' into 'master'
高支模图片放大缩小

See merge request !25
2022-06-30 17:37:59 +08:00
a99a934914 Merge branch 'dev-xiaomi' into 'master'
Dev xiaomi

See merge request !26
2022-06-30 17:37:50 +08:00
骆乐
ff255c7e94 修复 2022-06-29 17:51:19 +08:00
Luck-Xiaomi
db90a25b15 . 2022-06-28 16:39:37 +08:00
jxjgmj
4cf1ac2faa 高支模图片放大缩小 2022-06-28 15:40:17 +08:00
Luck-Xiaomi
1527cab8ee . 2022-06-28 15:40:10 +08:00
Luck-Xiaomi
9f21cb8247 优化星璇自动登录的跳转问题 2022-06-28 15:38:29 +08:00
9076eab3ff Merge branch 'dev-xiaole' into 'master'
Dev xiaole

See merge request !24
2022-06-28 14:20:03 +08:00
骆乐
a65b3e245e 冲突 2022-06-28 14:17:53 +08:00
骆乐
2b5c3e51c8 角色管理 2022-06-28 14:08:21 +08:00
骆乐
71a4c95e0c 新增防控管理的页面 2022-06-28 14:04:39 +08:00
骆乐
b49ab92983 解决冲突 2022-06-28 13:54:19 +08:00
骆乐
a58bada03b 修复广西联通的bug 2022-06-28 13:46:23 +08:00
845b4901de Merge branch 'dev-gmj' into 'master'
中建4

See merge request !23
2022-06-28 13:42:50 +08:00
jxjgmj
835f87d8ea 中建4 2022-06-28 09:09:51 +08:00
骆乐
ed8c265034 Merge branch 'master' into dev-xiaole 2022-06-27 16:01:00 +08:00
22aaa1efe0 Merge branch 'dev-gmj' into 'master'
修改表单星号样式及修改核酸过期人员列表分页样式

See merge request !21
2022-06-27 15:58:20 +08:00
fd32533101 Merge branch 'dev-xiaole' into 'master'
修复南昌地铁的bug

See merge request !22
2022-06-27 15:58:04 +08:00
骆乐
1941d45586 修复了广西联通的一些bug 2022-06-27 15:56:25 +08:00
骆乐
f92db374b1 添加了安全教育 上传下载上传材料 骆乐 2022-06-24 14:58:54 +08:00
骆乐
a01a3502b1 更改了标头配置 人员考勤打印 设备中台bug修复 骆乐 2022-06-23 16:29:13 +08:00
骆乐
f1d3b8879c 人员管理 添加 下发通行设备 以及修复了设备中台跳转 骆乐 2022-06-21 17:38:52 +08:00
骆乐
c51e0d347e 项目后台设备中台企业前台企业后台切换 骆乐 2022-06-21 15:26:23 +08:00
骆乐
06659d6804 修复南昌地铁的bug 2022-06-20 13:36:29 +08:00
jxjgmj
f1031d60fd 修改表单星号样式 2022-06-17 17:15:07 +08:00
jxjgmj
b890ba517f 修改核酸超时人员列表分页样式 2022-06-17 15:23:55 +08:00
jxjgmj
d1673e7245 Merge branch 'master' into dev-gmj 2022-06-17 15:22:19 +08:00
jxjgmj
a67458d58a 修改核酸超时人员列表分页样式 2022-06-17 15:21:27 +08:00
a7ff125b84 Merge branch 'dev-gmj' into 'master'
修复bug

See merge request !18
2022-06-17 11:24:32 +08:00
jxjgmj
838edc04a9 修复bug 2022-06-17 11:22:57 +08:00
349279f46f Merge branch 'dev-xiaole' into 'master'
更改了人员培训是否合格列表

See merge request !16
2022-06-17 11:13:57 +08:00
骆乐
855a683b30 更改了人员培训是否合格列表 2022-06-17 11:08:09 +08:00
2f18c8f698 Merge branch 'dev-gmj' into 'master'
核酸超时人员

See merge request !14
2022-06-17 11:02:52 +08:00
jxjgmj
2ba8f20bd4 Merge branch 'master' into dev-gmj 2022-06-17 11:00:27 +08:00
jxjgmj
13f13febdb 修复bug 2022-06-17 10:59:25 +08:00
jxjgmj
f8cadc5265 核酸超时人员 2022-06-16 19:58:54 +08:00
a982d76475 Merge branch 'dev-xiaole' into 'master'
Dev xiaole

See merge request !13
2022-06-16 18:22:47 +08:00
骆乐
4d92f4028a Merge branch 'master' into dev-xiaole 2022-06-16 18:15:10 +08:00
骆乐
7bf3f9c975 更改了花名册 和人员管理bug 2022-06-16 18:07:43 +08:00
37b39f0a30 Merge branch 'dev-gmj' into 'master'
添加字段及显示核酸状态

See merge request !12
2022-06-16 18:06:11 +08:00
jxjgmj
5d2dc5c4bf 添加字段及显示核酸状态 2022-06-16 14:33:15 +08:00
骆乐
183214eab8 更改项目名称 2022-06-15 18:26:00 +08:00