 mzl92
|
67ef59f9fd
|
Merge branch 'master' into develop
|
2025-10-21 15:11:45 +08:00 |
|
|
mzl92
|
951f2a6536
|
Finish Hotfix-1
|
2025-10-21 15:11:45 +08:00 |
|
|
mzl92
|
ec66208178
|
修正撤回再提交不显示签名
|
2025-10-21 15:11:37 +08:00 |
|
|
mzl92
|
07f9a4306f
|
Merge branch 'master' into develop
|
2025-10-21 14:46:50 +08:00 |
|
|
mzl92
|
86e68d2710
|
Finish Hotfix-1
|
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 |
|
|
mzl92
|
81f5e3c8ed
|
调整利润计算
|
2025-10-14 10:14:14 +08:00 |
|
|
mzl92
|
2df5bbb054
|
Finish mzl_dev
|
2025-10-13 18:55:06 +08:00 |
|
|
mzl92
|
b161f9a826
|
Merge branch 'develop' into feature/mzl_dev
|
2025-10-13 18:54:59 +08:00 |
|
|
mzl92
|
35609b9d43
|
修改备货单计算
|
2025-10-13 18:54:32 +08:00 |
|
|
mzl92
|
90d9f24eee
|
Finish mzl_dev
|
2025-10-13 15:45:49 +08:00 |
|
|
mzl92
|
6c8dec47ce
|
Merge branch 'develop' into feature/mzl_dev
|
2025-10-13 15:45:43 +08:00 |
|
|
mzl92
|
9d5a7241ce
|
ts
|
2025-10-13 15:45:29 +08:00 |
|
|
mzl92
|
176f700860
|
Finish mzl_dev
|
2025-10-13 15:43:57 +08:00 |
|
|
mzl92
|
63953c5643
|
Merge branch 'develop' into feature/mzl_dev
|
2025-10-13 15:43:51 +08:00 |
|
|
mzl92
|
ba9daaaa30
|
st
|
2025-10-13 15:43:34 +08:00 |
|
|
mzl92
|
a4c109aa14
|
Finish mzl_dev
|
2025-10-13 15:41:11 +08:00 |
|
|
mzl92
|
a354a286da
|
Merge branch 'develop' into feature/mzl_dev
|
2025-10-13 15:41:05 +08:00 |
|
|
mzl92
|
0752abd26d
|
调整
|
2025-10-13 15:40:46 +08:00 |
|
|
mzl92
|
8359847da4
|
Finish mzl_dev
|
2025-10-13 14:15:48 +08:00 |
|
|
mzl92
|
44da0615ee
|
Merge branch 'develop' into feature/mzl_dev
|
2025-10-13 14:15:43 +08:00 |
|
|
mzl92
|
83860c8222
|
调整询单提醒为邮件
|
2025-10-13 14:15:14 +08:00 |
|
|
mzl92
|
1139f2a3f1
|
Finish mzl_dev
|
2025-10-13 14:13:46 +08:00 |
|
|
mzl92
|
ab05017ae9
|
Merge branch 'develop' into feature/mzl_dev
|
2025-10-13 14:13:39 +08:00 |
|
|
mzl92
|
ae5a415b38
|
调整询单提醒为邮件
|
2025-10-13 14:13:08 +08:00 |
|
|
mzl92
|
04d7d73c45
|
增加业务强制绑定提醒
|
2025-10-13 13:27:22 +08:00 |
|
 18338781771
|
818c516484
|
Merge branch 'hotfix/crm' into develop
# Conflicts:
# app/common/utils/WsEvents.php
# app/controller/IndexController.php
# app/crmAdmin/service/CustomerService.php
|
2025-10-12 18:48:19 +08:00 |
|
|
18338781771
|
907e2f92a0
|
Merge branch 'hotfix/crm'
|
2025-10-12 18:45:17 +08:00 |
|
|
mzl92
|
ad740bfcd6
|
Merge branch 'develop'
|
2025-10-12 18:44:14 +08:00 |
|
|
mzl92
|
6b14eea6c3
|
Finish mzl_dev
|
2025-10-12 18:43:34 +08:00 |
|
|
mzl92
|
1b14d5450d
|
Merge branch 'develop' into feature/mzl_dev
|
2025-10-12 18:43:26 +08:00 |
|
|
mzl92
|
433dea5886
|
修正回调
|
2025-10-12 10:42:39 +00:00 |
|
|
mzl92
|
48c41618c5
|
Merge branch 'develop'
|
2025-10-12 18:34:10 +08:00 |
|
|
mzl92
|
a7b4d5592c
|
Finish mzl_dev
|
2025-10-12 18:33:45 +08:00 |
|