Commit Graph

130 Commits

Author SHA1 Message Date
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 b897771541 Merge branch 'develop' 2025-09-24 19:12:13 +08:00
mzl92 2a44802994 增加审批时间轴&&调整采购单 2025-09-24 17:38:04 +08:00
mzl92 07af16ed9d 调整基类更新后置方法&&增加转交、业务单详情 2025-09-24 15:24:29 +08:00
mzl92 368bfe44ee 采购单审批流程 2025-09-23 17:26:01 +08:00
root bdefd69a13 采购单处理 2025-09-22 15:50:36 +08:00
mzl92 e12d5951e4 修改计å¤备货单金额计算&&采购单编写†2025-09-22 01:55:34 +00:00
mzl92 b7b6edb06c Merge branch 'develop' 2025-09-18 15:05:57 +08:00
mzl92 cd29507c45 Merge branch 'develop' into feature/mzl_dev 2025-09-18 15:04:59 +08:00
mzl92 e5441d51ae 修改审批 2025-09-18 06:46:15 +00:00
18338781771 5fef15b0fa Merge branch 'feature/kpi' 2025-09-18 11:10:11 +08:00
18338781771 79a2a1e005 Merge branch 'hotfix/statistics' 2025-09-17 16:01:31 +08:00
18338781771 32d9ce3424 Merge branch 'hotfix/series' into develop 2025-09-17 14:15:37 +08:00
18338781771 3ef45a24c7 品牌推荐 2025-09-17 14:15:09 +08:00
18338781771 5b4842d6e8 Merge branch 'feature/kpi' into develop 2025-09-16 17:54:57 +08:00
18338781771 e88233229e Merge branch 'hotfix/statistics' into develop 2025-09-16 16:51:53 +08:00
18338781771 d70f7c8285 改装项 2025-09-16 14:16:13 +08:00
mzl92 62c32d25ff Merge branch 'develop' 2025-09-16 10:53:57 +08:00
mzl92 5ebcc88d96 Merge branch 'develop' into feature/mzl_dev 2025-09-15 16:39:23 +08:00
mzl92 f152529364 消息推送增加邮箱&&增加终版保存功能 2025-09-15 15:01:19 +08:00
18338781771 59b64c4f3c 车辆信息与车辆颜色放到crm端 2025-09-12 15:16:18 +08:00
18338781771 9461d41312 Merge branch 'feature/stock_next' into develop
# Conflicts:
#	app/admin/service/VehColorService.php
2025-09-12 14:29:53 +08:00
18338781771 cbb07d1f4c 汽车颜色 2025-09-12 14:25:02 +08:00
mzl92 7e83949ed5 移除废弃代码&&增加管理端备货单查看 2025-09-11 17:13:28 +08:00
mzl92 ee75d29831 Merge local route changes with remote 2025-09-11 15:30:59 +08:00
mzl92 0ab0dd91e0 Merge branch 'develop' into feature/mzl_dev 2025-09-10 18:35:43 +08:00
mzl92 60eb12a151 补充新功能 2025-09-10 18:34:20 +08:00
18338781771 726e5cf558 Merge branch 'feature/stock_next' into develop 2025-09-10 14:34:37 +08:00
18338781771 e59a690c31 文件删除 2025-09-10 14:33:12 +08:00
mzl92 7f32a6e7e8 管理端备货单 2025-09-09 18:02:10 +08:00
mzl92 1ede9581a2 crm 2025-09-09 17:30:39 +08:00
mzl92 eb4434c139 调整备货单&审批 2025-09-09 16:15:48 +08:00
mzl92 918bac19a5 审批&备货单 2025-09-09 13:42:00 +08:00
mzl92 153443d20f Merge branch 'feature/mzl_dev' of http://219.157.255.213:25311/xinyouhe/fdesk into feature/mzl_dev 2025-09-08 20:01:31 +08:00
mzl92 84c588496b 调整备货单 2025-09-08 20:00:12 +08:00
mzl92 8340f678d6 Merge branch 'develop' into feature/mzl_dev 2025-09-08 11:35:45 +08:00
mzl92 28368e27a7 审批&PDF生成 2025-09-08 11:34:19 +08:00
18338781771 259271a7aa kpi相关接口 2025-09-05 09:43:10 +08:00
mzl92 8a4848bc75 新增生成pdf 2025-09-05 09:26:29 +08:00