Commit Graph

759 Commits

Author SHA1 Message Date
mzl92 32a7752f8b Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	.gitignore
#	composer.lock
2025-12-02 14:17:25 +08:00
mzl92 00bd5ada53 ts 2025-11-28 17:37: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 1d9fbb9032 Merge branch 'develop' into feature/mzl_dev 2025-11-13 11:50:32 +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 c157b3ee12 更新类库 2025-11-12 11:35:22 +08:00
mzl92 80fbf6c35a Merge branch 'develop'
# Conflicts:
#	config/route.php
2025-11-11 16:46:22 +08:00
mzl92 d515bc07fe 备货单调整 2025-11-11 08:38:32 +00:00
mzl92 6ab4505e17 对账 2025-11-07 15:28:59 +08:00
mzl92 6c59fdef10 Merge branch 'develop'
# Conflicts:
#	app/common/service/StockOrdersService.php
2025-11-04 15:43:42 +08:00
mzl92 32452dc29a 调整汽车数据采集 2025-11-04 15:13:19 +08:00
mzl92 7e90b05dde Merge branch 'develop' into feature/mzl_dev 2025-11-04 13:11:44 +08:00
mzl92 f73bad8082 Merge branch 'develop' into feature/sku_crawl 2025-11-04 13:11:27 +08:00
mzl92 be4dcb4dd4 删除增加过滤 2025-11-04 13:10:46 +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 013fc83362 Merge branch 'develop' into feature/mzl_dev 2025-11-04 10:32:22 +08:00
mzl92 42bf32a9a5 修正编辑后的备货单绕过文件上传 2025-11-04 10:31:45 +08:00
mzl92 359755fdf1 Merge branch 'release' 2025-11-03 18:16:51 +08:00
mzl92 2f8f7dccf9 调整备货单功能 2025-11-03 18:07:56 +08:00
18338781771 49e7709ae3 Merge branch 'feature/fin' into develop 2025-11-01 14:59:46 +08:00
18338781771 5b77b8ed83 待入账 2025-11-01 14:59:41 +08:00
18338781771 a98769fb4c Merge branch 'feature/fin' into develop 2025-11-01 14:44:58 +08:00
18338781771 56ad551707 收汇凭证倒计时 2025-11-01 14:44:47 +08:00
18338781771 2711ed8f6a Merge branch 'feature/fin' into develop 2025-11-01 14:14:01 +08:00
18338781771 f1d5fae122 入账记录汇率 2025-11-01 14:13:55 +08:00
18338781771 4f965f8b5f Merge branch 'feature/fin' into develop 2025-11-01 14:02:21 +08:00
18338781771 4dbd72acce 待入账与入账实际汇率 2025-11-01 14:02:15 +08:00
18338781771 0c789b7a1a Merge branch 'feature/fin' into develop
# Conflicts:
#	app/common/service/FinReceiptService.php
2025-11-01 13:37:39 +08:00
18338781771 8674063e6e 付款记录作废 2025-11-01 13:36:18 +08:00
18338781771 1094bc406f Revert "作废"
This reverts commit 139d3509f4.
2025-11-01 13:22:45 +08:00
18338781771 596313ed5a Merge branch 'feature/fin' into develop 2025-11-01 13:20:38 +08:00
18338781771 74ac8941ea 统计 2025-11-01 13:20:33 +08:00
18338781771 6493bdebb1 待入账 2025-11-01 11:34:49 +08:00
18338781771 07a3d66079 Merge branch 'feature/fin' into develop 2025-11-01 11:32:16 +08:00
18338781771 18eb3e7c5d 统计 2025-11-01 11:32:10 +08:00
18338781771 262add20f8 Merge branch 'feature/fin' into develop
# Conflicts:
#	app/common/service/FinReceiptService.php
2025-11-01 09:47:56 +08:00
18338781771 139d3509f4 作废 2025-11-01 09:45:41 +08:00
18338781771 f7faf79809 待入账列表 2025-11-01 08:56:48 +08:00
18338781771 a0935c4332 暂停抓取车辆信息 2025-10-31 16:33:02 +08:00
18338781771 29ba35f9b6 收付款统计 2025-10-31 16:22:28 +08:00
18338781771 0e38f0f9bb Merge branch 'feature/fin' into develop 2025-10-31 10:17:52 +08:00
18338781771 43fe263df1 备货单编号 2025-10-31 10:17:41 +08:00
mzl92 821f455e47 Merge branch 'develop' into feature/mzl_dev 2025-10-31 09:47:48 +08:00
mzl92 24805257c7 调整内勤仪表盘曲线查询 2025-10-31 09:46:57 +08:00
18338781771 b4ce4fe672 Merge branch 'feature/fin' into develop 2025-10-30 18:49:33 +08:00
18338781771 206eff87e2 附件 2025-10-30 18:49:28 +08:00