Commit Graph

92 Commits

Author SHA1 Message Date
18338781771 521cfec00a Merge branch 'feature/merge' into develop 2025-12-05 10:34:41 +08:00
18338781771 82673cdcfa 仪表盘路由 2025-12-05 10:34:34 +08:00
18338781771 ac982b0957 Merge branch 'feature/merge' into develop 2025-12-05 10:28:48 +08:00
18338781771 b4b4f6cd5f 仪表盘路由 2025-12-05 10:28:36 +08:00
18338781771 d9e2c89c0e Merge branch 'feature/merge' into develop 2025-12-04 18:11:52 +08:00
18338781771 143dde08ce 仪表板路由 2025-12-04 18:11:45 +08:00
18338781771 81445a7096 Merge branch 'feature/merge' into develop 2025-12-04 18:10:16 +08:00
18338781771 2ffd053723 仪表盘路由 2025-12-04 18:10:09 +08:00
18338781771 1413a93d6d Merge branch 'feature/merge' into develop 2025-12-04 18:08:32 +08:00
18338781771 d238b47aa8 仪表盘路由 2025-12-04 18:08:26 +08:00
18338781771 65f0be0a5d Merge branch 'feature/merge' into develop 2025-12-04 17:54:46 +08:00
18338781771 5c3f8679ce 仪表盘路由规则 2025-12-04 17:54:40 +08:00
mzl92 32a7752f8b Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	.gitignore
#	composer.lock
2025-12-02 14:17:25 +08:00
18338781771 8a94de610d 询盘转发 2025-11-29 15:36:53 +08:00
mzl92 2c295cd631 tz 2025-11-26 15:51:05 +08:00
mzl92 80fbf6c35a Merge branch 'develop'
# Conflicts:
#	config/route.php
2025-11-11 16:46:22 +08:00
mzl92 6ab4505e17 对账 2025-11-07 15:28:59 +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 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
mzl92 e9636513ec 临时处理仪表盘显示 2025-10-30 17:55:08 +08:00
mzl92 8c3a445a39 Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	config/route.php
2025-10-30 14:39:10 +08:00
18338781771 2127473290 系统设置 2025-10-28 16:59:51 +08:00
18338781771 83d76b16b4 确认入账 2025-10-27 10:57:47 +08:00
18338781771 9fdce3eaf3 Merge branch 'feature/audit' 2025-10-24 15:02:20 +08:00
18338781771 18786591b1 Merge branch 'feature/audit' into develop 2025-10-24 15:02:01 +08:00
mzl92 b47d23cd67 Merge branch 'develop' 2025-10-24 11:15:09 +08:00
mzl92 c1ab40031d 调整采购单 2025-10-24 11:02:54 +08:00
18338781771 5e3d05e502 请求操作日志 2025-10-23 13:21:07 +08:00
mzl92 1058bd9cbd Merge branch 'develop' 2025-10-21 19:55:36 +08:00
mzl92 13ab4b7868 根据10.17沟通调整 2025-10-21 19:53:21 +08:00
18338781771 8c2d6e07ff 更新日志 2025-10-21 15:17:08 +08:00
mzl92 04d7d73c45 增加业务强制绑定提醒 2025-10-13 13:27:22 +08:00
mzl92 ddb4e5a484 Merge branch 'develop' into feature/mzl_dev 2025-10-11 16:50:14 +08:00
mzl92 009312ffa3 调整ä功能 2025-10-11 08:41:11 +00:00
18338781771 d337fa88a9 车型下拉返回 年份 2025-10-11 15:54:04 +08:00
18338781771 c33c57f3ca 车型下拉 2025-10-11 10:50:59 +08:00
mzl92 11b5a694ac 调整审批流&&增加人员分组 2025-10-10 11:09:37 +00:00
18338781771 ae6cd4ec78 变更历史 2025-09-26 16:43:09 +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
18338781771 36d1d333b1 付款与收款 2025-09-23 15:13:56 +08:00
mzl92 658fd1d6cb 增加业务员ID 2025-09-23 14:09:17 +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 cbc0270ad8 港口英文名 2025-09-17 18:39:12 +08:00