Commit Graph

1267 Commits

Author SHA1 Message Date
18338781771 359a8f403c Merge branch 'feature/inv' into develop 2026-02-06 15:51:53 +08:00
18338781771 3d33a502d9 1 2026-02-06 15:51:48 +08:00
18338781771 eeab4934cd Merge branch 'feature/inv' into develop 2026-02-06 15:47:22 +08:00
18338781771 74ca1a5d8c 归还列表 2026-02-06 15:47:14 +08:00
18338781771 488d510ad0 Merge branch 'feature/inv' into develop 2026-02-06 15:35:05 +08:00
18338781771 d719ee5ea2 审核权限 2026-02-06 15:34:01 +08:00
18338781771 04a3c85bc1 Merge branch 'feature/inv' into develop 2026-02-06 14:30:19 +08:00
18338781771 d3ed9c05c6 附件路径 2026-02-06 14:29:45 +08:00
18338781771 8105200154 Merge branch 'feature/inv' into develop 2026-02-06 14:02:14 +08:00
18338781771 070cb87d17 归还附件 2026-02-06 14:02:05 +08:00
18338781771 032b19a4ce Merge branch 'feature/inv' into develop 2026-02-06 13:24:28 +08:00
18338781771 320211cd21 1 2026-02-06 13:24:17 +08:00
18338781771 a2218dc517 Merge branch 'feature/inv' into develop 2026-02-06 13:05:05 +08:00
18338781771 7b1837ed20 归还详情与编辑 2026-02-06 13:04:51 +08:00
18338781771 828c8f1d60 Merge branch 'feature/inv' into develop 2026-02-05 15:47:02 +08:00
18338781771 b831775490 归还详情 2026-02-05 15:46:40 +08:00
18338781771 d58c54da76 Merge branch 'feature/inv' into develop 2026-02-05 14:57:16 +08:00
18338781771 cdb889137f 归还物品信息 2026-02-05 14:57:09 +08:00
18338781771 e3b38ee117 Merge branch 'feature/inv' into develop 2026-02-05 14:42:08 +08:00
18338781771 4464c86788 归还 2026-02-05 14:41:58 +08:00
18338781771 750c2fc642 Merge branch 'feature/inv' into develop 2026-02-05 13:40:45 +08:00
18338781771 a521cfcaf4 借用状态 2026-02-05 13:40:38 +08:00
18338781771 385f380914 Merge branch 'feature/inv' into develop 2026-02-05 13:18:36 +08:00
18338781771 e84aba0a49 借用单筛选 2026-02-05 13:18:29 +08:00
18338781771 f67f9ddef9 Merge branch 'feature/inv' into develop 2026-02-05 11:38:55 +08:00
18338781771 a39c18b714 审批 2026-02-05 11:38:49 +08:00
18338781771 44dc6c06ee Merge branch 'feature/inv' into develop 2026-02-05 11:06:14 +08:00
18338781771 757689573b 审批id 2026-02-05 11:06:05 +08:00
18338781771 be44d1dda2 Merge branch 'feature/inv' into develop 2026-02-05 10:48:33 +08:00
18338781771 28e5afe62a 物品管理员需是同一人 2026-02-05 10:48:26 +08:00
18338781771 e922e78ae2 Merge branch 'feature/inv' into develop 2026-02-05 10:22:17 +08:00
18338781771 7bf2249ce6 移动端登录 2026-02-05 10:22:10 +08:00
18338781771 f0a92cafda Merge branch 'feature/inv' into develop
# Conflicts:
#	app/process/CheckWeb.php
2026-02-05 09:56:37 +08:00
18338781771 9686e52484 1 2026-02-05 09:55:25 +08:00
18338781771 c896bef9a6 Merge branch 'feature/inv' into develop
# Conflicts:
#	app/controller/IndexController.php
#	composer.lock
#	config/route.php
2026-02-05 09:51:21 +08:00
18338781771 a8cab8c51c 领用耗材 2026-02-05 09:33:27 +08:00
18338781771 e4f0d107ec Merge branch 'feature/crawl' into develop 2026-02-05 09:17:16 +08:00
18338781771 30f3e211af 抓取品牌 2026-02-05 09:16:24 +08:00
18338781771 eee09316df 抓取车型信息 2026-02-04 17:35:08 +08:00
18338781771 a16429ff3a 物品归还 2026-02-04 09:28:54 +08:00
mzl 59750d52f6 Merge branch 'master' into develop 2026-02-03 11:15:04 +08:00
mzl 2da3804953 Finish Hotfix-1 2026-02-03 11:15:03 +08:00
mzl eae699cd27 ts 2026-02-03 11:14:45 +08:00
18338781771 bce47e81f8 Merge branch 'hotfix/customer' into develop 2026-02-03 10:51:30 +08:00
18338781771 4ea4204ff4 渠道调整 2026-02-03 10:51:08 +08:00
18338781771 6496a40679 物品归还 2026-02-02 15:25:16 +08:00
18338781771 ab3bffe7cb 借用 2026-02-02 13:17:11 +08:00
18338781771 a8d1309349 1 2026-01-30 10:46:54 +08:00
18338781771 80d0196c3d Merge branch 'hotfix/stockn' into develop 2026-01-22 17:23:16 +08:00
18338781771 67a39917f0 过滤未提交的 2026-01-22 17:20:29 +08:00