10396 ba72e50421 Merge remote-tracking branch 'origin/master' into dev ... # Conflicts: # .gitignore # common/tool.js # package-lock.json # pages.json # pages/application/blind-board/home.vue # pages/application/confinedspace/home.vue # pages/application/eight-assignments.vue # pages/application/electricity/home.vue # pages/application/highwork/home.vue # pages/application/hoisting/home.vue # pages/application/hotwork/home.vue # pages/application/open-circuit/home.vue # pages/application/safety-environmental-inspection/apply/detail-plead.vue # pages/application/safety-environmental-inspection/apply/detail.vue # pages/application/safety-environmental-inspection/apply/flowChart.vue # pages/application/safety-environmental-inspection/apply/list.vue # pages/application/safety-environmental-inspection/apply/show.vue # pages/application/safety-environmental-inspection/archive/detail-check.vue # pages/application/safety-environmental-inspection/archive/detail-hidden.vue # pages/application/safety-environmental-inspection/archive/detail.vue # pages/application/safety-environmental-inspection/archive/list-hidden.vue # pages/application/safety-environmental-inspection/defense-record/list.vue # pages/application/safety-environmental-inspection/inspected/detail.vue # pages/application/safety-environmental-inspection/inspector/detail.vue # pages/application/safety-environmental-inspection/rectification/detail.vue # pages/basics/home.vue # pages/login/home.vue		2025-07-03 14:15:04 +08:00
..
application	Merge remote-tracking branch 'origin/master' into dev	2025-07-03 14:15:04 +08:00
basics	Merge remote-tracking branch 'origin/master' into dev	2025-07-03 14:15:04 +08:00
index	版本升级	2024-06-29 15:10:01 +08:00
login	Merge remote-tracking branch 'origin/master' into dev	2025-07-03 14:15:04 +08:00
my	图片替换	2024-05-07 11:25:40 +08:00
news	BUG优化 风险管控清单 隐患排查清单 二维码功能	2024-07-02 10:20:18 +08:00
null	初始化提交	2024-01-16 17:24:49 +08:00
questionnaire	更换高危作业顺序	2024-02-27 14:14:33 +08:00
works	从业人员管理	2024-03-22 15:08:55 +08:00