Commit Graph

288 Commits (e5653b4c568a51f12fd18ceeffec1e0bc3b1065c)

Author SHA1 Message Date
haha 815e830e30 安全问题草稿 2025-02-19 00:28:46 +08:00
haha 9b80dc0edc update code 2025-02-17 22:20:49 +08:00
姜玉琦 71b00ac449 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-02-17 00:10:35 +08:00
姜玉琦 8d889e30ea 提交代码 2025-02-17 00:10:27 +08:00
lj7788@126.com e227a1a158 隐患管理 2025-02-16 17:21:39 +08:00
姜玉琦 c9104c62e3 提交代码 2025-02-16 17:20:25 +08:00
姜玉琦 d4fb05d7d1 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-02-16 10:30:28 +08:00
姜玉琦 20f9f2864d 提交代码 2025-02-16 10:30:18 +08:00
lj7788@126.com cee68db1d3 隐患安全前端页面-代码生成 2025-02-15 16:57:13 +08:00
lj7788@126.com 5b28d1cbea 隐患管理后台代码-生成器 2025-02-15 16:52:57 +08:00
姜玉琦 849401501a 提交 2025-02-15 14:58:31 +08:00
姜玉琦 25e1882b4c Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-02-15 14:21:10 +08:00
姜玉琦 a5f0802170 提交 2025-02-15 14:20:56 +08:00
haha c0dc65db73 在合并 "dev_xd" 和 "origin/dev_xd" 前自动存档 2025-02-13 23:25:27 +08:00
姜玉琦 1c6c543523 提交代码 2025-02-13 00:20:27 +08:00
姜玉琦 41f8cfcd35 提交代码 2025-02-12 00:19:52 +08:00
姜玉琦 e6cc6dbf52 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-02-11 23:12:01 +08:00
姜玉琦 dc560902e3 提交代码 2025-02-11 23:11:51 +08:00
haha e4479a11ad 修改绿能的导入和导出功能 2025-02-11 23:08:06 +08:00
haha 53193f94bb 修改人员花名册 2025-02-11 22:30:06 +08:00
haha f4ecf0425f Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-02-11 22:29:35 +08:00
姜玉琦 44d498c2dc 提交diamagnetic 2025-02-11 15:01:56 +08:00
姜玉琦 04fbf42be4 提交代码 2025-02-10 11:28:21 +08:00
haha 55b1ed0d1e Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-02-10 01:16:54 +08:00
姜玉琦 a38dfefa84 提交代码 2025-02-10 00:30:03 +08:00
姜玉琦 acb89e5bc1 提交代码 2025-02-09 23:21:48 +08:00
haha 42f0beb605 修改用户管理和花名册列表增加人员岗位显示 2025-02-09 22:32:13 +08:00
haha 049a04bcc7 人员表中增加人员岗位 2025-02-09 21:56:02 +08:00
姜玉琦 ce126e5682 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-02-08 00:21:51 +08:00
姜玉琦 ee3ac9904a 提交 2025-02-08 00:21:43 +08:00
haha 1a9f23ee0b 修复绿碳功能问题 2025-02-06 22:28:43 +08:00
haha 3540ec00ee 修改前端功能 2025-02-05 23:47:15 +08:00
haha dedd2dc535 Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-02-05 23:46:45 +08:00
姜玉琦 674595d683 提交 2025-02-05 23:44:23 +08:00
haha 24f70b0efb Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-02-05 22:05:04 +08:00
haha 3d0597c252 修改用户查询,增加com_name 2025-02-05 22:05:00 +08:00
姜玉琦 72ff6d6f49 提交代码 2025-02-05 21:56:28 +08:00
姜玉琦 d45a66a2fe 提交代码 2025-02-05 21:34:43 +08:00
haha 9f3b2b35b2 update code 2025-02-02 22:46:26 +08:00
haha b682453d76 解决冲突 2025-01-25 23:33:10 +08:00
haha 7978582c60 Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-01-25 23:28:33 +08:00
haha 716b388d46 Revert "更新文件"
This reverts commit 886fe18434.
2025-01-25 23:26:46 +08:00
lj7788@126.com 5a19e81931 修改考勤参数 2025-01-25 14:37:50 +08:00
lj7788@126.com af69e57c4f 修改考勤的保存功能 2025-01-25 13:03:47 +08:00
haha 886fe18434 更新文件 2025-01-24 23:40:35 +08:00
haha 19fb6e61f9 动态从身份证图片中获取数据 2025-01-24 23:37:20 +08:00
haha a8853781c4 增加身份证识别功能 2025-01-24 00:12:27 +08:00
haha c48a9130d7 Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-01-23 00:02:20 +08:00
haha 42e7f1f2c0 修改花名册 2025-01-23 00:02:01 +08:00
姜玉琦 a278edbd29 提交代码 2025-01-22 00:21:04 +08:00