 mzl92
|
76bd46a0d7
|
Merge branch 'master' into develop
|
2025-11-13 11:47:16 +08:00 |
|
|
mzl92
|
515a16a633
|
Finish Hotfix-1
|
2025-11-13 11:47:16 +08:00 |
|
|
mzl92
|
f0abdca45a
|
ts
|
2025-11-13 11:47:07 +08:00 |
|
|
mzl92
|
20188521fd
|
ts
|
2025-11-13 11:45:38 +08:00 |
|
|
mzl92
|
00ab988469
|
Finish Hotfix-1
|
2025-11-13 11:42:34 +08:00 |
|
|
mzl92
|
1d4224bf4a
|
Merge branch 'master' into develop
|
2025-11-13 11:42:34 +08:00 |
|
|
mzl92
|
d388b6ace9
|
ts
|
2025-11-13 11:42:22 +08:00 |
|
|
mzl92
|
f388ad41d6
|
Finish Hotfix-1
|
2025-11-13 10:06:30 +08:00 |
|
|
mzl92
|
8b8336437a
|
Merge branch 'master' into develop
|
2025-11-13 10:06:30 +08:00 |
|
|
mzl92
|
8b3778e83e
|
调整
|
2025-11-13 10:06:19 +08:00 |
|
|
mzl92
|
80fbf6c35a
|
Merge branch 'develop'
# Conflicts:
# config/route.php
|
2025-11-11 16:46:22 +08:00 |
|
|
mzl92
|
2d7456b74c
|
Finish mzl_dev
|
2025-11-11 16:44:13 +08:00 |
|
|
mzl92
|
8740918785
|
Merge branch 'develop' into feature/mzl_dev
|
2025-11-11 16:44:00 +08:00 |
|
|
mzl92
|
d515bc07fe
|
备货单调整
|
2025-11-11 08:38:32 +00:00 |
|
|
mzl92
|
39820844f7
|
修改忽略
|
2025-11-07 16:34:57 +08:00 |
|
|
mzl92
|
6ab4505e17
|
对账
|
2025-11-07 15:28:59 +08:00 |
|
|
mzl92
|
6c59fdef10
|
Merge branch 'develop'
# Conflicts:
# app/common/service/StockOrdersService.php
|
2025-11-04 15:43:42 +08:00 |
|
|
mzl92
|
663d29dc61
|
Finish mzl_dev
|
2025-11-04 15:13:41 +08:00 |
|
|
mzl92
|
862a87d66f
|
Merge branch 'develop' into feature/mzl_dev
|
2025-11-04 15:13:35 +08:00 |
|
|
mzl92
|
32452dc29a
|
调整汽车数据采集
|
2025-11-04 15:13:19 +08:00 |
|
|
mzl92
|
f19ec4edc4
|
Finish mzl_dev
|
2025-11-04 13:11:54 +08:00 |
|
|
mzl92
|
7e90b05dde
|
Merge branch 'develop' into feature/mzl_dev
|
2025-11-04 13:11:44 +08:00 |
|
|
mzl92
|
29dd6a2954
|
Finish sku_crawl
|
2025-11-04 13:11:34 +08:00 |
|
|
mzl92
|
f73bad8082
|
Merge branch 'develop' into feature/sku_crawl
|
2025-11-04 13:11:27 +08:00 |
|
|
mzl92
|
be4dcb4dd4
|
删除增加过滤
|
2025-11-04 13:10:46 +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
|
1eccabb806
|
Finish mzl_dev
|
2025-11-04 10:33:40 +08:00 |
|
|
mzl92
|
013fc83362
|
Merge branch 'develop' into feature/mzl_dev
|
2025-11-04 10:32:22 +08:00 |
|
|
mzl92
|
42bf32a9a5
|
修正编辑后的备货单绕过文件上传
|
2025-11-04 10:31:45 +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 |
|
 18338781771
|
49e7709ae3
|
Merge branch 'feature/fin' into develop
|
2025-11-01 14:59:46 +08:00 |
|
|
18338781771
|
5b77b8ed83
|
待入账
|
2025-11-01 14:59:41 +08:00 |
|
|
18338781771
|
a98769fb4c
|
Merge branch 'feature/fin' into develop
|
2025-11-01 14:44:58 +08:00 |
|
|
18338781771
|
56ad551707
|
收汇凭证倒计时
|
2025-11-01 14:44:47 +08:00 |
|
|
18338781771
|
2711ed8f6a
|
Merge branch 'feature/fin' into develop
|
2025-11-01 14:14:01 +08:00 |
|
|
18338781771
|
f1d5fae122
|
入账记录汇率
|
2025-11-01 14:13:55 +08:00 |
|
|
18338781771
|
4f965f8b5f
|
Merge branch 'feature/fin' into develop
|
2025-11-01 14:02:21 +08:00 |
|
|
18338781771
|
4dbd72acce
|
待入账与入账实际汇率
|
2025-11-01 14:02:15 +08:00 |
|
|
18338781771
|
0c789b7a1a
|
Merge branch 'feature/fin' into develop
# Conflicts:
# app/common/service/FinReceiptService.php
|
2025-11-01 13:37:39 +08:00 |
|
|
18338781771
|
8674063e6e
|
付款记录作废
|
2025-11-01 13:36:18 +08:00 |
|
|
18338781771
|
1094bc406f
|
Revert "作废"
This reverts commit 139d3509f4.
|
2025-11-01 13:22:45 +08:00 |
|
|
18338781771
|
596313ed5a
|
Merge branch 'feature/fin' into develop
|
2025-11-01 13:20:38 +08:00 |
|
|
18338781771
|
74ac8941ea
|
统计
|
2025-11-01 13:20:33 +08:00 |
|
|
18338781771
|
6493bdebb1
|
待入账
|
2025-11-01 11:34:49 +08:00 |
|
|
18338781771
|
07a3d66079
|
Merge branch 'feature/fin' into develop
|
2025-11-01 11:32:16 +08:00 |
|
|
18338781771
|
18eb3e7c5d
|
统计
|
2025-11-01 11:32:10 +08:00 |
|
|
18338781771
|
262add20f8
|
Merge branch 'feature/fin' into develop
# Conflicts:
# app/common/service/FinReceiptService.php
|
2025-11-01 09:47:56 +08:00 |
|
|
18338781771
|
139d3509f4
|
作废
|
2025-11-01 09:45:41 +08:00 |
|
|
18338781771
|
f7faf79809
|
待入账列表
|
2025-11-01 08:56:48 +08:00 |
|