Commit Graph

98 Commits

Author SHA1 Message Date
mzl92 253616b2bb Merge branch 'master' into develop 2025-12-02 18:02:21 +08:00
mzl92 e2f79598b2 调整邮件转发移除不参与分配人员 2025-12-02 18:02:12 +08:00
mzl92 32a7752f8b Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	.gitignore
#	composer.lock
2025-12-02 14:17:25 +08:00
mzl92 80d458a8b0 修改邮件转发接收人规则 2025-12-02 01:58:54 +00: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 d515bc07fe 备货单调整 2025-11-11 08:38:32 +00:00
mzl92 6ab4505e17 对账 2025-11-07 15:28:59 +08:00
mzl92 359755fdf1 Merge branch 'release' 2025-11-03 18:16:51 +08:00
mzl92 2f8f7dccf9 调整备货单功能 2025-11-03 18:07:56 +08:00
mzl92 8c3a445a39 Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	config/route.php
2025-10-30 14:39:10 +08:00
mzl92 6f7531deb9 Merge branch 'develop' 2025-10-22 16:16:27 +08:00
mzl92 7486803468 调整pdf模板文件 2025-10-22 16:15:08 +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
mzl92 07f9a4306f Merge branch 'master' into develop 2025-10-21 14:46:50 +08:00
mzl92 aad950da98 修正pdf模板 2025-10-21 14:46:42 +08:00
mzl92 4c94392ef6 ts 2025-10-21 13:35:17 +08:00
mzl92 6a3420f93e PDF增加报关价 2025-10-14 15:00:41 +08:00
mzl92 0752abd26d 调整 2025-10-13 15:40:46 +08:00
mzl92 ae5a415b38 调整询单提醒为邮件 2025-10-13 14:13:08 +08:00
mzl92 04d7d73c45 增加业务强制绑定提醒 2025-10-13 13:27:22 +08: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 72e2b46f60 调整消息推送“ 2025-10-12 08:59:39 +00:00
mzl92 7e820ee9c4 增加消息推送 2025-10-12 06:22:29 +00: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 07af16ed9d 调整基类更新后置方法&&增加转交、业务单详情 2025-09-24 15:24:29 +08:00
mzl92 8f2c47d8cb 修改审批流程模块儿 2025-09-24 11:18:59 +08:00
mzl92 368bfe44ee 采购单审批流程 2025-09-23 17:26:01 +08:00
mzl92 2e51c320e6 调整备货单pdf 2025-09-23 11:54:26 +08:00
mzl92 426d5bce62 Merge branch 'develop' into feature/mzl_dev 2025-09-23 10:01:45 +08:00
root bdefd69a13 采购单处理 2025-09-22 15:50:36 +08:00
mzl92 20e3ce3b27 修改审批 2025-09-19 07:43:48 +00:00
mzl92 8fb21de92e 调整自动分配用户ID 2025-09-18 17:54:37 +08:00
mzl92 b7b6edb06c Merge branch 'develop' 2025-09-18 15:05:57 +08:00
mzl92 9331aa2f36 修改文件路径 2025-09-18 07:04:14 +00:00
mzl92 e5441d51ae 修改审批 2025-09-18 06:46:15 +00:00
mzl92 62c32d25ff Merge branch 'develop' 2025-09-16 10:53:57 +08:00
mzl92 1bb74341d1 增加菜单迁移脚本 2025-09-16 10:45:02 +08:00
mzl92 67eaba2687 ts 2025-09-15 16:38:00 +08:00
mzl92 f152529364 消息推送增加邮箱&&增加终版保存功能 2025-09-15 15:01:19 +08:00
mzl92 fe64299303 增加审批签名 2025-09-11 16:52:10 +08:00
mzl92 eb13146763 调整 2025-09-11 15:31:37 +08:00
mzl92 60eb12a151 补充新功能 2025-09-10 18:34:20 +08:00
mzl92 17efdf01df Merge branch 'develop' into feature/mzl_dev 2025-09-10 13:39:06 +08:00
mzl92 1ede9581a2 crm 2025-09-09 17:30:39 +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