Commit Graph

100 Commits

Author SHA1 Message Date
liang.chao 1e10fd13f4 代码提交 2026-02-06 15:56:28 +08:00
jiask bbc5634ed9 jsk 2026-02-06 15:08:19 +08:00
haozq 9a536a4ddb Merge remote-tracking branch 'origin/main' 2026-02-06 14:24:15 +08:00
haozq 731364daef 添加按钮及页面样式修改 2026-02-06 14:23:39 +08:00
jiask ce6022dff3 jsk 2026-02-06 11:12:47 +08:00
jiask cf226ddae7 jsk 机具占比 修改 2026-02-06 10:22:52 +08:00
jiask a391018944 Merge branch 'main' of http://192.168.0.75:3000/bonus/GZMachinesWeb 2026-02-06 10:21:36 +08:00
jiask 38236a98d0 jsk 机具占比 修改 2026-02-06 10:21:06 +08:00
liang.chao 3b3afebb93 代码提交 2026-02-06 10:20:00 +08:00
haozq 0774d7f588 修改首页跳转及批量审核 2026-02-06 10:04:30 +08:00
liang.chao 400efc5505 代码提交 2026-02-06 09:48:59 +08:00
liang.chao 4e7158c2a4 代码提交 2026-02-06 09:42:49 +08:00
liang.chao 052bb6d687 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	resources/mybatis/index/IndexHomeDetailsMapper.xml
2026-02-06 09:40:26 +08:00
liang.chao acab5b9d68 代码提交 2026-02-06 09:38:56 +08:00
jiask 979610f496 Merge branch 'main' of http://192.168.0.75:3000/bonus/GZMachinesWeb 2026-02-05 18:40:21 +08:00
liang.chao 4ae5128b23 代码提交 2026-02-05 18:35:37 +08:00
jiask dfcd61fa31 jsk 数据概览 修改 2026-02-05 18:35:18 +08:00
liang.chao b64a0948e1 代码提交 2026-02-05 18:14:58 +08:00
jiask 3c046f5ee6 jsk 数据概览 修改 2026-02-05 17:01:09 +08:00
liang.chao 3f42f95b41 代码提交 2026-02-05 14:27:46 +08:00
haozq 3fe0fe901d Merge remote-tracking branch 'origin/main' 2026-02-03 18:04:29 +08:00
haozq 996927fa7f 机具库存收藏修改 2026-02-03 18:04:06 +08:00
hayu b65007b909 结算修改去掉数量 2026-02-03 13:29:14 +08:00
haozq 631ff33f7a 结算的bug修改 2026-02-03 12:36:45 +08:00
haozq cf19884318 修改跳转路径 2026-02-03 10:27:08 +08:00
liang.chao 89eaccf189 代码提交 2026-02-02 16:20:59 +08:00
liang.chao 199ced5e85 机具领料逻辑修改 2026-02-02 16:11:54 +08:00
liang.chao b75dd3ff91 机具领料逻辑修改 2026-02-02 15:57:30 +08:00
haozq 06b3398dd7 对机具出入库 领料 首页展示 问题进行修改 2026-02-02 15:36:13 +08:00
liang.chao f647018215 机具领料逻辑修改 2026-02-02 13:12:04 +08:00
liang.chao 6ff779ea85 机具领料逻辑修改 2026-02-02 11:29:02 +08:00
liang.chao 06b37f0185 首页预警计划到期代码提交 2026-02-02 10:34:24 +08:00
liang.chao 7f4d00ca00 首页预警代码提交 2026-01-30 17:42:57 +08:00
马三炮 417cb7e497 新增系统问题下载 2026-01-30 10:47:06 +08:00
马三炮 be36d03fce 结算修复 2026-01-29 13:21:30 +08:00
马三炮 0a55d87aae 修改样式 2026-01-29 10:24:19 +08:00
hayu 4ccd339437 结算修改 2026-01-28 20:52:18 +08:00
hayu 48cf463236 结算修改 2026-01-28 18:09:27 +08:00
hayu 181a93d340 Merge remote-tracking branch 'origin/main' 2026-01-27 10:26:47 +08:00
马三炮 bb2d49e944 修改sql语句 2026-01-23 10:17:18 +08:00
马三炮 d21636425e 恢复被覆盖的代码 2026-01-22 18:25:33 +08:00
haozq 463dfdc5ce 修改结算逻辑 2026-01-22 17:45:16 +08:00
haozq 88218faa48 提交 2026-01-22 17:37:26 +08:00
马三炮 693bbe6610 领料明细导出合并同一天同一型号机具数据 2026-01-22 15:54:28 +08:00
马三炮 eb6d66c279 领料明细导出合并同一天同一型号机具数据 2026-01-22 15:24:01 +08:00
马三炮 4065a867a4 结算导出领退料明细 2026-01-22 10:36:44 +08:00
haozq 2307a79659 修改日期 2026-01-20 11:32:41 +08:00
hayu dce6fcfa4f 修改 2026-01-06 15:36:17 +08:00
hayu 075a7f53f6 机具领用导入模板优化 2026-01-06 15:28:29 +08:00
syruan 38a49ad0a8 首页导航条修改 2026-01-04 17:02:46 +08:00