Commit Graph

185 Commits

Author SHA1 Message Date
18338781771 0067a7508f Merge branch 'feature/inv' into develop 2026-02-24 11:28:21 +08:00
18338781771 cd692594e4 物品扫码领用与库存 2026-02-24 11:28:12 +08:00
18338781771 6028ad3b6a Merge branch 'feature/inv' into develop 2026-02-12 15:33:30 +08:00
18338781771 7098f30af2 确认归还 2026-02-12 15:33:23 +08:00
18338781771 1dfc183cac Merge branch 'feature/inv' into develop 2026-02-09 10:40:56 +08:00
18338781771 25b79d6f63 物品领用 2026-02-09 10:40:50 +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 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 eee09316df 抓取车型信息 2026-02-04 17:35:08 +08:00
18338781771 a16429ff3a 物品归还 2026-02-04 09:28:54 +08:00
18338781771 ab3bffe7cb 借用 2026-02-02 13:17:11 +08:00
18338781771 a8d1309349 1 2026-01-30 10:46:54 +08:00
mzl92 733996f346 修改询盘自动配置 2026-01-22 10:15:05 +08:00
mzl92 dffaac5b07 ts 2026-01-08 15:08:35 +08:00
mzl92 f7b94da39f ts 2026-01-08 15:04:39 +08:00
mzl92 99551bba7f 移除加纳询盘独立分配 2026-01-08 09:14:17 +08:00
18338781771 cab15c4fab 借用列表与详情 2026-01-07 10:49:33 +08:00
18338781771 c38a53f053 物品下拉 2026-01-05 10:42:08 +08:00
mzl92 57251718b4 调整询盘分配人员 2026-01-04 10:47:46 +08:00
mzl92 31a610664f inquiry ts 2025-12-18 15:10:43 +08:00
mzl92 5aadcac7e3 ts 2025-12-16 14:22:21 +08:00
mzl92 56f8657886 ts 2025-12-16 13:44:38 +08:00
mzl92 c29c4941fc Merge branch 'develop' 2025-12-15 16:06:51 +08:00
mzl92 eea13a2a58 Merge branch 'develop'
# Conflicts:
#	app/command/InquiryImportFbCommand.php
#	app/inquiry/utils/FbLeadHeaderMapper.php
2025-12-12 17:52:20 +08:00
mzl92 628429af66 Merge branch 'develop' 2025-12-10 20:18:46 +08:00
mzl92 725710abcb ts 2025-12-09 07:33:04 +00:00
18338781771 4ff2c2493b 文件大小限制调整 2025-12-09 11:51:22 +08:00
mzl92 399eaa2b5c 物品领用 2025-12-05 09:22:53 +00:00
18338781771 5c3f8679ce 仪表盘路由规则 2025-12-04 17:54:40 +08:00
18338781771 05e39d2d65 询单转发 2025-11-29 17:50:08 +08:00
18338781771 1e37560301 询单转发 2025-11-29 15:46:11 +08:00
18338781771 8a94de610d 询盘转发 2025-11-29 15:36:53 +08:00
mzl92 80fbf6c35a Merge branch 'develop'
# Conflicts:
#	config/route.php
2025-11-11 16:46:22 +08:00
mzl92 6c59fdef10 Merge branch 'develop'
# Conflicts:
#	app/common/service/StockOrdersService.php
2025-11-04 15:43:42 +08:00
mzl92 aabd0f4634 Merge branch 'develop'
# Conflicts:
#	app/admin/controller/dashboard/FinStatisticsController.php
#	app/common/controller/FinPaymentApplyController.php
#	app/common/controller/FinReceiptController.php
#	app/common/logic/FinReceiptLogic.php
#	app/common/model/FinPaymentApply.php
#	app/common/model/FinReceipt.php
#	app/common/service/FinPaymentApplyService.php
#	app/common/service/FinReceiptService.php
#	app/common/service/StockOrdersService.php
#	config/route.php
2025-11-04 10:36:52 +08:00
mzl92 359755fdf1 Merge branch 'release' 2025-11-03 18:16:51 +08:00
18338781771 8c2d6e07ff 更新日志 2025-10-21 15:17:08 +08:00
mzl92 ddb4e5a484 Merge branch 'develop' into feature/mzl_dev 2025-10-11 16:50:14 +08:00
18338781771 b63a79697c 港口路由 2025-10-11 16:47:07 +08:00
mzl92 009312ffa3 调整ä功能 2025-10-11 08:41:11 +00:00
18338781771 c33c57f3ca 车型下拉 2025-10-11 10:50:59 +08:00
mzl92 11b5a694ac 调整审批流&&增加人员分组 2025-10-10 11:09:37 +00:00
18338781771 5d764beeb1 路由恢复 2025-10-10 16:59:17 +08:00
18338781771 4fe008354d 车辆品牌与抓取车系 2025-10-10 16:48:33 +08:00
mzl92 0a8ebe169c Merge branch 'develop' 2025-09-26 15:58:02 +08:00
mzl92 5eaf9ff254 检测站点加入进程 2025-09-26 15:54:42 +08:00
mzl92 223d57483c Merge branch 'develop'
# Conflicts:
#	app/controller/IndexController.php
2025-09-26 15:52:45 +08:00
mzl92 86ab70979c 增加操作日志记录&&web站点检查 2025-09-26 15:50:23 +08:00
mzl92 b897771541 Merge branch 'develop' 2025-09-24 19:12:13 +08:00