骆乐
|
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 |
|
|
|
e1849cbd81
|
Merge branch 'dev-xiaole' into 'master'
Dev xiaole
See merge request !11
|
2022-06-15 18:12:59 +08:00 |
|
骆乐
|
6b224df68b
|
改样式
|
2022-06-15 18:08:20 +08:00 |
|
骆乐
|
5603818e7c
|
更改全局样式
|
2022-06-15 17:51:21 +08:00 |
|
|
|
9189949eef
|
Merge branch 'dev-xiaomi' into 'master'
Dev xiaomi
See merge request !10
|
2022-06-15 17:33:14 +08:00 |
|
骆乐
|
3aa15ac249
|
更改了全局样式
|
2022-06-15 17:25:37 +08:00 |
|
Luck-Xiaomi
|
92e9619318
|
.
|
2022-06-15 17:18:56 +08:00 |
|
Luck-Xiaomi
|
c024005c88
|
Merge branch 'dev-xiaole' of http://139.9.66.234:18023/dhp/zhgdyun into dev-xiaomi
|
2022-06-15 17:10:34 +08:00 |
|
Luck-Xiaomi
|
7afa2b8554
|
.
|
2022-06-15 17:05:27 +08:00 |
|
|
|
aad9d3f0ce
|
Merge branch 'dev-xiaole' into 'master'
Dev xiaole
See merge request !9
|
2022-06-15 16:42:00 +08:00 |
|
骆乐
|
bbbca84b57
|
更改了全局样式
|
2022-06-15 16:40:46 +08:00 |
|
Luck-Xiaomi
|
14f1af9d6c
|
Merge branch 'master' of http://139.9.66.234:18023/dhp/zhgdyun into dev-xiaomi
|
2022-06-15 16:38:06 +08:00 |
|
Luck-Xiaomi
|
eb0ef35d0b
|
Merge remote-tracking branch 'origin/dev-xiaole' into dev-xiaomi
|
2022-06-15 16:12:14 +08:00 |
|
|
|
eb5593565f
|
Merge branch 'dev-xiaomi' into 'master'
Dev xiaomi
See merge request !8
|
2022-06-15 16:08:25 +08:00 |
|
Luck-Xiaomi
|
a549a15d9a
|
Merge branch 'master' into dev-xiaomi
|
2022-06-15 15:59:39 +08:00 |
|
Luck-Xiaomi
|
39bcd9ccc6
|
.
|
2022-06-15 15:56:28 +08:00 |
|
骆乐
|
81fe7735f6
|
Merge branch 'master' into dev-xiaole
|
2022-06-15 15:51:26 +08:00 |
|
骆乐
|
9c69803e87
|
登录页更改
|
2022-06-15 15:49:13 +08:00 |
|
|
|
1d6bf0050a
|
Merge branch 'dev-gmj' into 'master'
Dev gmj
See merge request !6
|
2022-06-15 15:48:23 +08:00 |
|
jxjgmj
|
da2edfc6f2
|
双碳管理及合约管理
|
2022-06-15 15:42:53 +08:00 |
|
