Commit Graph

917 Commits

Author SHA1 Message Date
mzl92 8c3a445a39 Merge branch 'develop' into feature/mzl_dev
# Conflicts:
#	config/route.php
2025-10-30 14:39:10 +08:00
mzl92 a7d623656d 内勤仪表盘 2025-10-30 14:37:21 +08:00
mzl92 770664e70f Merge branch 'develop' into feature/mzl_dev 2025-10-24 15:47:12 +08:00
mzl92 6bd4ed9ec3 ts备货单 2025-10-24 15:46:20 +08:00
18338781771 211fe575b8 Merge branch 'feature/audit' into develop 2025-10-24 15:25:44 +08:00
18338781771 24b3ef4415 日志排序 2025-10-24 15:25:29 +08:00
18338781771 18786591b1 Merge branch 'feature/audit' into develop 2025-10-24 15:02:01 +08:00
mzl92 1c3585b079 Finish mzl_dev 2025-10-24 11:04:35 +08:00
mzl92 8db33a40a4 Merge branch 'develop' into feature/mzl_dev 2025-10-24 11:04:27 +08:00
mzl92 c1ab40031d 调整采购单 2025-10-24 11:02:54 +08:00
mzl92 2c8efc18f9 Finish mzl_dev 2025-10-24 10:44:12 +08:00
mzl92 03ab55bd63 Merge branch 'develop' into feature/mzl_dev 2025-10-24 10:44:00 +08:00
mzl92 4326bcd68b 调整备货单 2025-10-24 10:43:36 +08:00
18338781771 33efdc8534 Merge branch 'hotfix/port' into develop 2025-10-23 14:19:43 +08:00
18338781771 30ffb87811 港口调整 2025-10-23 14:18:57 +08:00
18338781771 5e3d05e502 请求操作日志 2025-10-23 13:21:07 +08:00
mzl92 6f7531deb9 Merge branch 'develop' 2025-10-22 16:16:27 +08:00
mzl92 797256e707 Finish mzl_dev 2025-10-22 16:16:01 +08:00
mzl92 448d151106 Merge branch 'develop' into feature/mzl_dev 2025-10-22 16:15:55 +08:00
mzl92 7486803468 调整pdf模板文件 2025-10-22 16:15:08 +08:00
18338781771 4c1ac68a2b Merge branch 'hotfix/sku' into develop 2025-10-22 10:45:24 +08:00
18338781771 777b43ca2c 车辆指纹 2025-10-22 10:43:39 +08:00
18338781771 1cb5a1d5b2 Merge branch 'hotfix/sku' into develop 2025-10-22 10:35:50 +08:00
18338781771 11cfb45b87 车辆指纹 2025-10-22 10:34:36 +08:00
mzl92 1058bd9cbd Merge branch 'develop' 2025-10-21 19:55:36 +08:00
mzl92 55850aef81 Finish mzl_dev 2025-10-21 19:54:42 +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 951f2a6536 Finish Hotfix-1 2025-10-21 15:11:45 +08:00
mzl92 67ef59f9fd Merge branch 'master' into develop 2025-10-21 15:11:45 +08:00
mzl92 ec66208178 修正撤回再提交不显示签名 2025-10-21 15:11:37 +08:00
mzl92 86e68d2710 Finish Hotfix-1 2025-10-21 14:46:50 +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 f17646238e Merge branch 'master' into develop 2025-10-21 14:06:24 +08:00
mzl92 409375107a Finish Hotfix-1 2025-10-21 14:06:23 +08:00
mzl92 817adb6c14 ts 2025-10-21 14:05:40 +08:00
mzl92 03d010ec88 Finish mzl_dev 2025-10-21 13:41:40 +08:00
mzl92 13d24d041d Merge branch 'develop' into feature/mzl_dev 2025-10-21 13:41:27 +08:00
mzl92 4c94392ef6 ts 2025-10-21 13:35:17 +08:00
mzl92 6617090cf8 Finish Hotfix-1 2025-10-16 09:15:53 +08:00
mzl92 5c6978c803 Merge branch 'master' into develop 2025-10-16 09:15:53 +08:00
mzl92 8d850de272 移除网站篡改检查 2025-10-16 09:15:42 +08:00
mzl92 26e16d1f07 Finish mzl_dev 2025-10-14 15:01:28 +08:00
mzl92 6a3420f93e PDF增加报关价 2025-10-14 15:00:41 +08:00
mzl92 bc0491f053 Finish mzl_dev 2025-10-14 12:02:55 +08:00
mzl92 526812f8ed 移除利润计算&直接入库前端计算结果 2025-10-14 12:02:26 +08:00
mzl92 5f9b4bc471 Finish mzl_dev 2025-10-14 11:06:02 +08:00
mzl92 7d3bd8b1f2 Merge branch 'develop' into feature/mzl_dev 2025-10-14 11:05:29 +08:00
mzl92 0b8155936a 调整利润计算 2025-10-14 11:03:26 +08:00