Commit Graph

74 Commits

Author SHA1 Message Date
mzl92 80fbf6c35a Merge branch 'develop'
# Conflicts:
#	config/route.php
2025-11-11 16:46:22 +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 9fdce3eaf3 Merge branch 'feature/audit' 2025-10-24 15:02:20 +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
18338781771 8c2d6e07ff 更新日志 2025-10-21 15:17:08 +08:00
mzl92 04d7d73c45 增加业务强制绑定提醒 2025-10-13 13:27:22 +08:00
mzl92 009312ffa3 调整ä功能 2025-10-11 08:41:11 +00:00
mzl92 11b5a694ac 调整审批流&&增加人员分组 2025-10-10 11:09:37 +00:00
mzl92 2a44802994 增加审批时间轴&&调整采购单 2025-09-24 17:38:04 +08:00
mzl92 8f2c47d8cb 修改审批流程模块儿 2025-09-24 11:18:59 +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 20e3ce3b27 修改审批 2025-09-19 07:43:48 +00: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 c25405832a Merge branch 'hotfix/series' into develop 2025-09-17 18:40:11 +08:00
18338781771 cbc0270ad8 港口英文名 2025-09-17 18:39:12 +08:00
18338781771 5ac1244329 Merge branch 'hotfix/series' into develop 2025-09-17 15:33:34 +08:00
18338781771 9ac777b694 账号描述 2025-09-17 15:33:19 +08:00
18338781771 5b4842d6e8 Merge branch 'feature/kpi' into develop 2025-09-16 17:54:57 +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 4222710d94 Merge branch 'develop' into feature/stock_next 2025-09-12 15:15:14 +08:00
18338781771 3ad05165bd 账户增加公司归属 2025-09-12 14:49:36 +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 eb13146763 调整 2025-09-11 15:31:37 +08:00
mzl92 60eb12a151 补充新功能 2025-09-10 18:34:20 +08:00
mzl92 eb4434c139 调整备货单&审批 2025-09-09 16:15:48 +08:00
mzl92 663267ce5a Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	app/admin/service/SysDictService.php
2025-09-09 13:44:14 +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
18338781771 259271a7aa kpi相关接口 2025-09-05 09:43:10 +08:00
mzl92 ea38afff9a 备货单完善 2025-09-04 18:22:24 +08:00
18338781771 09502dc503 Merge branch 'feature/upload' into develop 2025-09-04 14:56:16 +08:00
mzl92 ced046aa18 增加关联关系 2025-09-04 11:52:40 +08:00
mzl92 dcabbb697a Merge branch 'develop' into feature/mzl_dev 2025-09-04 10:27:19 +08:00
mzl92 249b61ddb8 备货单&审批流程 2025-09-04 10:26:28 +08:00
18338781771 b7abe60d71 上传 2025-09-03 11:03:22 +08:00
18338781771 152ce9a75f 港口场景筛选 2025-09-02 18:04:09 +08:00
mzl92 6a1ab1f5c3 增加备货单 2025-09-02 17:22:56 +08:00
18338781771 005bc4e2e6 货币 2025-09-02 17:02:03 +08:00
18338781771 4ad408c0b2 客户下拉 2025-09-02 15:42:30 +08:00
18338781771 da3e5e2a2d Merge branch 'feature/stock_next' into develop
# Conflicts:
#	app/admin/controller/SysDictController.php
#	app/admin/controller/VehColorController.php
#	app/admin/service/SysDictService.php
#	app/common/model/SysCurrency.php
#	app/controller/IndexController.php
#	config/route.php
2025-09-02 11:55:14 +08:00