Commit Graph

62 Commits

Author SHA1 Message Date
18338781771 8a94de610d 询盘转发 2025-11-29 15:36:53 +08:00
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
mzl92 1058bd9cbd Merge branch 'develop' 2025-10-21 19:55:36 +08:00
mzl92 009312ffa3 调整ä功能 2025-10-11 08:41:11 +00:00
mzl92 11b5a694ac 调整审批流&&增加人员分组 2025-10-10 11:09:37 +00:00
mzl92 81c7267b39 ts 2025-09-24 18:15:16 +08:00
mzl92 ad7b42db45 增加时间轴内容 2025-09-24 17:43:48 +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
mzl92 e5441d51ae 修改审批 2025-09-18 06:46:15 +00: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
mzl92 7e83949ed5 移除废弃代码&&增加管理端备货单查看 2025-09-11 17:13:28 +08:00
mzl92 17efdf01df Merge branch 'develop' into feature/mzl_dev 2025-09-10 13:39:06 +08:00
mzl92 7f32a6e7e8 管理端备货单 2025-09-09 18:02:10 +08:00
mzl92 eb4434c139 调整备货单&审批 2025-09-09 16:15:48 +08:00
mzl92 918bac19a5 审批&备货单 2025-09-09 13:42:00 +08:00
mzl92 84c588496b 调整备货单 2025-09-08 20:00:12 +08:00
mzl92 28368e27a7 审批&PDF生成 2025-09-08 11:34:19 +08:00
18338781771 152ce9a75f 港口场景筛选 2025-09-02 18:04:09 +08:00
18338781771 005bc4e2e6 货币 2025-09-02 17:02:03 +08:00
18338781771 4ad408c0b2 客户下拉 2025-09-02 15:42:30 +08:00
18338781771 36f9c82c8b 分类 2025-09-02 15:07:35 +08:00
18338781771 aa5619f405 字典分类 2025-09-02 14:47:21 +08:00
18338781771 223b952742 字典分类 2025-09-02 13:54:21 +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
18338781771 935caa24f2 字典分类 2025-09-02 11:46:02 +08:00
mzl92 7ded55ca0e 增加全量范围字典查询 2025-09-01 17:08:02 +08:00
mzl92 b3d8029e6d Merge branch 'develop_bm' into feature/mzl_dev
# Conflicts:
#	app/controller/IndexController.php
#	config/route.php
2025-09-01 14:06:34 +08:00
18338781771 87728793c2 港口 2025-08-28 16:01:41 +08:00
18338781771 df8a47c947 账户 2025-08-28 15:19:39 +08:00
18338781771 035450e762 改装 2025-08-28 14:04:58 +08:00
18338781771 3bb2d93b83 品牌logo 2025-08-28 11:18:53 +08:00
18338781771 149909dd09 车辆颜色 2025-08-28 11:12:27 +08:00
18338781771 db0892f455 品牌 2025-08-28 09:57:46 +08:00
18338781771 280c26983f 货币 2025-08-27 17:39:59 +08:00
18338781771 b751975e3f 数据格式化 2025-08-27 16:43:30 +08:00
18338781771 989bf299b5 1 2025-08-27 15:31:25 +08:00
mzl92 39e840bba8 Merge branch 'develop' 2025-08-14 20:08:57 +08:00
18338781771 060d464f09 用户中心 2025-08-14 18:07:34 +08:00
18338781771 a8ec6889d0 更新用户 2025-08-14 17:43:19 +08:00
18338781771 fa7fdc3787 更新用户 2025-08-14 17:39:34 +08:00
18338781771 1559dc47e7 校验 2025-08-14 17:22:03 +08:00
18338781771 377407eb7d Merge branch 'develop' into feature/user0812 2025-08-14 11:15:42 +08:00
mzl@hnxinyouhe.com 311e407601 修改用户授权&调整生成文件 2025-08-14 10:55:46 +08:00
18338781771 2233fb4d6b 后台编辑个人信息 2025-08-14 10:33:45 +08:00
18338781771 f326665716 Merge branch 'develop' into feature/user0812
# Conflicts:
#	app/admin/service/UserService.php
#	config/route.php
2025-08-14 10:09:56 +08:00