Commit Graph

883 Commits

Author SHA1 Message Date
mzl92 6128a084fc Merge branch 'master' into develop
# Conflicts:
#	app/process/CheckWeb.php
2025-09-26 16:44:50 +08:00
mzl92 189dbc0058 Finish Hotfix-1 2025-09-26 16:44:02 +08:00
mzl92 795a6ff1d1 修改站点检查 2025-09-26 16:43:54 +08:00
mzl92 0a8ebe169c Merge branch 'develop' 2025-09-26 15:58:02 +08:00
mzl92 4e9dc978e0 Finish mzl_dev 2025-09-26 15:57:34 +08:00
mzl92 5beaa11cf7 Merge branch 'develop' into feature/mzl_dev 2025-09-26 15:57:21 +08:00
mzl92 f30d20c1f2 Merge branch 'feature/mzl_dev' of http://219.157.255.213:25311/xinyouhe/fdesk into feature/mzl_dev 2025-09-26 15:55:39 +08:00
mzl92 5eaf9ff254 检测站点加入进程 2025-09-26 15:54:42 +08:00
mzl92 223d57483c Merge branch 'develop'
# Conflicts:
#	app/controller/IndexController.php
2025-09-26 15:52:45 +08:00
mzl92 ef9daab263 Finish mzl_dev 2025-09-26 15:51:55 +08:00
mzl92 9bba4b6b7d Merge branch 'develop' into feature/mzl_dev 2025-09-26 15:51:47 +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
mzl92 10de0722bf Finish mzl_dev 2025-09-24 18:20:04 +08:00
mzl92 177150d59c Merge branch 'develop' into feature/mzl_dev 2025-09-24 18:19:05 +08: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
18338781771 70b7430477 Merge branch 'hotfix/crm' into develop 2025-09-24 15:42:20 +08:00
18338781771 04208b3b5c 车辆搜索 2025-09-24 15:42:10 +08:00
mzl92 07af16ed9d 调整基类更新后置方法&&增加转交、业务单详情 2025-09-24 15:24:29 +08:00
mzl92 8f2c47d8cb 修改审批流程模块儿 2025-09-24 11:18:59 +08:00
18338781771 c6fee31ac9 Merge branch 'hotfix/crm' into develop 2025-09-24 10:22:56 +08:00
18338781771 c3539c7cf1 客户渠道筛选 2025-09-24 10:22:43 +08:00
18338781771 0cb98023f7 Merge branch 'master' into hotfix/crm 2025-09-24 10:17:49 +08:00
mzl92 368bfe44ee 采购单审批流程 2025-09-23 17:26:01 +08:00
mzl92 658fd1d6cb 增加业务员ID 2025-09-23 14:09:17 +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
mzl92 aa3ee8acff 调整备货单&&修改采购单 2025-09-22 18:49:18 +08:00
mzl92 419d0e9d54 采购单修改 2025-09-22 16:47:50 +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
18338781771 4b1aa90734 Merge branch 'hotfix/series' 2025-09-19 15:42:35 +08:00
18338781771 b7000b0ce7 Merge branch 'hotfix/series' into develop 2025-09-19 15:42:21 +08:00
18338781771 4b2bd0d340 港口 2025-09-19 15:42:11 +08:00
mzl92 c76402dbee Finish Hotfix-1 2025-09-18 17:54:49 +08:00
mzl92 bdf833aaf6 Merge branch 'master' into develop 2025-09-18 17:54:49 +08: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 47432e80bf Finish mzl_dev 2025-09-18 15:05:17 +08:00
mzl92 cd29507c45 Merge branch 'develop' into feature/mzl_dev 2025-09-18 15:04:59 +08:00
mzl92 9331aa2f36 修改文件路径 2025-09-18 07:04:14 +00:00
mzl92 e5441d51ae 修改审批 2025-09-18 06:46:15 +00:00
18338781771 5fef15b0fa Merge branch 'feature/kpi' 2025-09-18 11:10:11 +08:00
18338781771 e2f2e0147e Merge branch 'feature/kpi' into develop 2025-09-18 10:05:02 +08:00
18338781771 9307450009 年度目标禁止重复录入 2025-09-18 10:04:54 +08:00
18338781771 8fea768e3c Merge branch 'feature/kpi' into develop 2025-09-18 09:51:01 +08:00
18338781771 9c32ae51db kpi 2025-09-18 09:50:50 +08:00