Commit Graph

181 Commits (68182377e01ca8e14c4f7251fca88a58018fcce7)

Author SHA1 Message Date
tangjie 68182377e0 fix 2026-07-10 14:38:17 +08:00
tangjie bfaadb2d9f fix 2026-07-10 13:43:58 +08:00
tangjie c4ed635cbd Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-07-10 10:39:23 +08:00
tangjie 4fb5866543 fix 2026-07-10 10:38:16 +08:00
huwei 95224ffa84 Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev
# Conflicts:
#	src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js
#	src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js
2026-07-10 10:12:45 +08:00
huwei 85120fcf75 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	jjb.config.js
2026-07-10 10:03:10 +08:00
tangjie 3ea60e9bb9 Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-07-10 10:03:04 +08:00
tangjie e0866b7ed1 fix 2026-07-10 10:03:03 +08:00
huwei bff50093d1 bug修护 2026-07-10 10:02:53 +08:00
luotaiqian d9552440d2 Merge remote-tracking branch 'origin/dev' into dev 2026-07-10 09:52:30 +08:00
luotaiqian a3a84e7d24 bug fix 2026-07-10 09:52:23 +08:00
tangjie e23f937749 Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-07-10 09:46:47 +08:00
tangjie ffd0d68cce fix 2026-07-10 09:46:46 +08:00
tangjie 7b697b099b fix 2026-07-10 09:28:43 +08:00
luotaiqian 0f03bc49d2 bug fix 2026-07-10 09:26:24 +08:00
tangjie b49e43f1b7 fix 2026-07-09 18:35:05 +08:00
tangjie bc292b63ab fix 2026-07-09 18:03:32 +08:00
huwei 6f76b42841 Merge remote-tracking branch 'origin/dev' into dev 2026-07-09 17:20:42 +08:00
huwei 53f903e633 bug修护 2026-07-09 17:20:35 +08:00
luotaiqian 17106eec15 Merge remote-tracking branch 'origin/dev' into dev 2026-07-09 17:16:46 +08:00
luotaiqian a347a89ba6 bug fix 2026-07-09 17:16:40 +08:00
huwei 0819789efc Merge remote-tracking branch 'origin/dev' into dev 2026-07-09 17:13:04 +08:00
huwei c5218e1d0c bug修护 2026-07-09 17:12:54 +08:00
tangjie 3fbe3acbd8 fix 2026-07-09 17:12:07 +08:00
tangjie 81d563036f Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-07-09 17:00:45 +08:00
tangjie f14bd082c8 feat 2026-07-09 17:00:19 +08:00
luotaiqian 7352e0ee9c bug fix 2026-07-09 16:28:52 +08:00
luotaiqian d92907de52 Merge remote-tracking branch 'origin/dev' into dev 2026-07-09 14:54:41 +08:00
luotaiqian e2273d0dcf bug fix 2026-07-09 14:54:35 +08:00
tangjie 79ed9d685a fix 2026-07-09 14:23:28 +08:00
tangjie e9fbc2ddc5 fix 2026-07-09 14:15:20 +08:00
tangjie 2c4344b69a fix 2026-07-09 13:15:13 +08:00
tangjie b573b0947f fix 2026-07-09 11:21:39 +08:00
tangjie 1a9a2b30f5 fix 2026-07-09 10:58:27 +08:00
tangjie 7cba6bcaa8 fix 2026-07-09 10:03:36 +08:00
tangjie 5fc1a9c8e4 Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-07-09 09:52:05 +08:00
tangjie a495eb3f83 feat 2026-07-09 09:52:04 +08:00
huwei 213224cf83 bug修护 2026-07-09 09:43:00 +08:00
huwei f3d9291fdb Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-07-09 09:24:30 +08:00
huwei fa9357b9b0 测试 2026-07-09 09:24:16 +08:00
tangjie 1c55fce948 feat 2026-07-09 09:23:22 +08:00
tangjie 3460e81ea4 fix 2026-07-08 22:33:22 +08:00
luotaiqian 21ff39b55d Merge remote-tracking branch 'origin/dev' into dev 2026-07-08 21:09:04 +08:00
luotaiqian 7eef9c828f bug fix 2026-07-08 21:08:57 +08:00
tangjie c0dbf43805 Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-07-08 20:55:24 +08:00
tangjie 467251bbcf fix 2026-07-08 20:55:23 +08:00
luotaiqian 67a82667f2 bug fix 2026-07-08 20:31:28 +08:00
tangjie 73411b43e8 Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev 2026-07-08 20:09:50 +08:00
tangjie c8352af81b fix 2026-07-08 20:09:49 +08:00
huwei 080691d675 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main.js
2026-07-08 18:16:51 +08:00