Commit Graph

627 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 a0935c4332 暂停抓取车辆信息 2025-10-31 16:33:02 +08:00
18338781771 e62becd30b 上传文件优化 2025-10-29 11:46:08 +08:00
18338781771 6184689e81 Merge branch 'feature/audit' 2025-10-24 16:32:52 +08:00
18338781771 cd6c4b425d 入参搜索 2025-10-24 16:32:23 +08:00
mzl92 cb4a3a3cd3 Merge branch 'develop' 2025-10-24 15:47:46 +08:00
18338781771 15309c537f Merge branch 'feature/audit' 2025-10-24 15:25:55 +08:00
18338781771 24b3ef4415 日志排序 2025-10-24 15:25:29 +08:00
18338781771 9fdce3eaf3 Merge branch 'feature/audit' 2025-10-24 15:02:20 +08:00
mzl92 b47d23cd67 Merge branch 'develop' 2025-10-24 11:15:09 +08:00
18338781771 30ffb87811 港口调整 2025-10-23 14:18:57 +08:00
18338781771 5e3d05e502 请求操作日志 2025-10-23 13:21:07 +08:00
mzl92 6f7531deb9 Merge branch 'develop' 2025-10-22 16:16:27 +08:00
18338781771 777b43ca2c 车辆指纹 2025-10-22 10:43:39 +08:00
18338781771 11cfb45b87 车辆指纹 2025-10-22 10:34:36 +08:00
mzl92 1058bd9cbd Merge branch 'develop' 2025-10-21 19:55:36 +08:00
18338781771 8c2d6e07ff 更新日志 2025-10-21 15:17:08 +08:00
mzl92 ec66208178 修正撤回再提交不显示签名 2025-10-21 15:11:37 +08:00
mzl92 aad950da98 修正pdf模板 2025-10-21 14:46:42 +08:00
mzl92 817adb6c14 ts 2025-10-21 14:05:40 +08:00
mzl92 8d850de272 移除网站篡改检查 2025-10-16 09:15:42 +08:00
mzl92 6a3420f93e PDF增加报关价 2025-10-14 15:00:41 +08:00
mzl92 526812f8ed 移除利润计算&直接入库前端计算结果 2025-10-14 12:02:26 +08:00
mzl92 0b8155936a 调整利润计算 2025-10-14 11:03:26 +08:00
mzl92 81f5e3c8ed 调整利润计算 2025-10-14 10:14:14 +08:00
mzl92 35609b9d43 修改备货单计算 2025-10-13 18:54:32 +08:00
mzl92 9d5a7241ce ts 2025-10-13 15:45:29 +08:00
mzl92 ba9daaaa30 st 2025-10-13 15:43:34 +08:00
mzl92 0752abd26d 调整 2025-10-13 15:40:46 +08:00
mzl92 83860c8222 调整询单提醒为邮件 2025-10-13 14:15:14 +08:00
mzl92 ab05017ae9 Merge branch 'develop' into feature/mzl_dev 2025-10-13 14:13:39 +08:00
mzl92 ae5a415b38 调整询单提醒为邮件 2025-10-13 14:13:08 +08:00
mzl92 04d7d73c45 增加业务强制绑定提醒 2025-10-13 13:27:22 +08:00
18338781771 907e2f92a0 Merge branch 'hotfix/crm' 2025-10-12 18:45:17 +08:00
mzl92 ad740bfcd6 Merge branch 'develop' 2025-10-12 18:44:14 +08:00
mzl92 433dea5886 修正回调 2025-10-12 10:42:39 +00:00
mzl92 48c41618c5 Merge branch 'develop' 2025-10-12 18:34:10 +08:00
mzl92 f0e768ef98 Merge branch 'develop' into feature/mzl_dev 2025-10-12 18:32:51 +08:00
mzl92 78ea8479ae 修正终版备货æŒ单 2025-10-12 10:32:13 +00:00
mzl92 4376c668ba Merge branch 'master' into develop
# Conflicts:
#	app/common/utils/WsEvents.php
#	app/controller/IndexController.php
2025-10-12 17:40:37 +08:00
mzl92 cf05cce7a5 ts 2025-10-12 17:36:15 +08:00
18338781771 7ff7cba602 详情去标签优化 2025-10-12 17:24:54 +08:00
mzl92 89d633389c Merge branch 'develop' 2025-10-12 17:10:14 +08:00
mzl92 72e2b46f60 调整消息推送“ 2025-10-12 08:59:39 +00:00
mzl92 9dcba987ef Merge branch 'develop' into feature/mzl_dev 2025-10-12 14:23:17 +08:00
mzl92 7e820ee9c4 增加消息推送 2025-10-12 06:22:29 +00:00
18338781771 a07ae1d594 Merge branch 'feature/sku_crawl' into develop 2025-10-11 18:12:10 +08:00