Commit Graph

193 Commits

Author SHA1 Message Date
18338781771 35f80aab1a Revert "Merge branch 'feature/inv' into develop"
This reverts commit facf0b4c10, reversing
changes made to 1221e42917.
2026-01-07 17:21:09 +08:00
18338781771 b35e536c79 物品领用审核 2026-01-07 17:20:21 +08:00
18338781771 facf0b4c10 Merge branch 'feature/inv' into develop 2026-01-07 13:39:12 +08:00
18338781771 5a7a6a45d4 借用详情 2026-01-07 13:38:47 +08:00
18338781771 4dc708e133 Merge branch 'feature/inv' into develop 2026-01-07 11:08:07 +08:00
18338781771 63011a0351 借用列表 2026-01-07 11:07:43 +08:00
18338781771 5bcca5cb12 Merge branch 'feature/inv' into develop 2026-01-07 10:58:15 +08:00
18338781771 2b529a27c8 物品借用审批列表 2026-01-07 10:57:28 +08:00
18338781771 502740e106 Merge branch 'feature/inv' into develop 2026-01-07 09:44:29 +08:00
18338781771 139acd9e70 产品规格不必传处理 2026-01-07 09:42:08 +08:00
18338781771 52eac05d43 Merge branch 'feature/inv' into develop 2026-01-05 10:42:16 +08:00
18338781771 c38a53f053 物品下拉 2026-01-05 10:42:08 +08:00
18338781771 615e9745a0 Merge branch 'feature/inv' into develop
# Conflicts:
#	composer.lock
#	config/route.php
2026-01-04 16:29:36 +08:00
18338781771 ca757e67dd 移动端回调 2026-01-04 16:27:20 +08:00
mzl92 376411dd79 Merge branch 'hotfix/Hotfix-1' into develop
# Conflicts:
#	app/common/service/StockOrdersService.php
2025-12-25 16:10:24 +08:00
mzl92 83ff52c1a0 Merge branch 'hotfix/Hotfix-1' into develop
# Conflicts:
#	app/common/service/StockOrdersService.php
2025-12-25 16:08:10 +08:00
mzl92 db7f5d568c Merge branch 'hotfix/Hotfix-1' into develop 2025-12-25 16:00:35 +08:00
mzl92 d81fdae406 备货单审批增加兜底检查 2025-12-23 14:44:43 +08:00
mzl92 861b8b216f 增加备货单修改兜底检查 2025-12-23 14:35:57 +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 b391608d87 内勤备货单查询 2025-12-09 11:12:36 +08:00
18338781771 0ace4a7b0b 内勤备货单查询 2025-12-09 11:08:51 +08:00
18338781771 7258d9890e 内勤备货单查询 2025-12-09 10:54:58 +08:00
18338781771 8c3fbd4d9a 内勤备货单查询 2025-12-09 10:48:59 +08:00
18338781771 a33b109ddb 内勤备货单查询 2025-12-08 15:01:02 +08:00
18338781771 4bcc6c53f7 备货单与审批数据过滤 2025-12-08 13:42:20 +08:00
18338781771 32aa7170a5 备货单与审批数据过滤 2025-12-08 13:24:37 +08:00
18338781771 59994d1f5a 备货单与审批数据过滤 2025-12-08 13:22:37 +08:00
18338781771 a0a71161d3 备货单与审批数据过滤 2025-12-08 13:19:16 +08:00
mzl92 399eaa2b5c 物品领用 2025-12-05 09:22:53 +00:00
18338781771 5c3f8679ce 仪表盘路由规则 2025-12-04 17:54:40 +08:00
18338781771 3520f10572 直属上级与内勤 2025-12-04 15:06:34 +08:00
18338781771 1858d3e586 返回角色id 2025-12-04 14:34:38 +08:00
mzl92 32a7752f8b Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	.gitignore
#	composer.lock
2025-12-02 14:17:25 +08:00
18338781771 bf74d9b917 询单转发 2025-12-01 17:48:44 +08:00
18338781771 05e39d2d65 询单转发 2025-11-29 17:50:08 +08:00
18338781771 af8577064d 记录寻盘 2025-11-29 16:13:53 +08:00
18338781771 8a94de610d 询盘转发 2025-11-29 15:36:53 +08:00
18338781771 6bdcc73ee8 模糊抓取优化 2025-11-28 16:12:10 +08:00
mzl92 2c295cd631 tz 2025-11-26 15:51:05 +08:00
mzl92 134505be8c 修改爬虫服务 2025-11-25 10:55:56 +08:00
mzl92 79d19a53e6 二手车信息爬虫服务 2025-11-24 18:29:11 +08:00
mzl92 f0abdca45a ts 2025-11-13 11:47:07 +08:00
mzl92 20188521fd ts 2025-11-13 11:45:38 +08:00
mzl92 d388b6ace9 ts 2025-11-13 11:42:22 +08:00
mzl92 8b3778e83e 调整 2025-11-13 10:06:19 +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