|
|
a47421f758
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 15:43:55 +08:00 |
|
|
|
60d56109fe
|
余量查询最新月份
|
2025-10-21 15:43:43 +08:00 |
|
|
|
60f4775cbc
|
过滤删除的条目
|
2025-10-21 14:50:56 +08:00 |
|
|
|
71f9b24935
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 14:21:14 +08:00 |
|
|
|
61441bd201
|
bug修复
|
2025-10-21 14:21:04 +08:00 |
|
|
|
4359e001ea
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 13:40:55 +08:00 |
|
|
|
8381244d86
|
余量计算修改
|
2025-10-21 13:40:47 +08:00 |
|
|
|
a8ffa7b798
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 13:30:20 +08:00 |
|
|
|
49a96cbadc
|
1
|
2025-10-21 13:30:14 +08:00 |
|
|
|
78e41e8a1c
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 11:33:42 +08:00 |
|
|
|
17d4581092
|
修改扩展接口
|
2025-10-21 11:33:31 +08:00 |
|
|
|
39d899288a
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 10:47:16 +08:00 |
|
|
|
f5b64a3d86
|
解决NAN错误
|
2025-10-21 10:47:08 +08:00 |
|
|
|
8700778baa
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 10:19:58 +08:00 |
|
|
|
7c30bac725
|
余量信息修订
|
2025-10-21 10:19:48 +08:00 |
|
|
|
54b5668049
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 10:02:30 +08:00 |
|
|
|
23e3d3371f
|
扩展修订
|
2025-10-21 09:59:55 +08:00 |
|
|
|
ed629f515f
|
过滤被删除的订单
|
2025-10-21 09:38:42 +08:00 |
|
|
|
6cfbf9e079
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-20 17:02:08 +08:00 |
|
|
|
36ef189971
|
补充余量信息字段
|
2025-10-20 16:59:40 +08:00 |
|
|
|
5ec0375d2a
|
补充余量信息字段
|
2025-10-20 16:56:59 +08:00 |
|
|
|
fb085348dc
|
解决冲突
|
2025-10-20 15:20:26 +08:00 |
|
|
|
af4ad3339f
|
订单详情添加类型
|
2025-10-20 15:19:59 +08:00 |
|
|
|
f8c5105580
|
修改余量创建
|
2025-10-20 14:21:31 +08:00 |
|
|
|
426334fa3d
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-20 11:52:50 +08:00 |
|
|
|
3e1739d5c0
|
bugfix: 添加进行中的任务和已完成任务数量排序。修改报错提示
|
2025-10-20 11:52:28 +08:00 |
|
|
|
99bcece551
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-20 10:16:22 +08:00 |
|
|
|
c67a84cca7
|
bugfix: 移除重复索引
|
2025-10-20 10:16:11 +08:00 |
|
|
|
b7d792ce07
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-17 16:54:04 +08:00 |
|
|
|
abe34505b3
|
bugfix: 修复报错
|
2025-10-17 16:53:42 +08:00 |
|
|
|
d858ec0039
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-17 16:36:34 +08:00 |
|
|
|
8f0fa39ab9
|
bugfix: 添加迁移任务余额表和任务日志表
|
2025-10-17 16:36:17 +08:00 |
|
|
|
ad202d8739
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
|
2025-10-17 16:16:27 +08:00 |
|
|
|
be4f88e943
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-17 16:00:01 +08:00 |
|
|
|
4897fbe098
|
修改字段类型
|
2025-10-17 15:59:50 +08:00 |
|
|
|
d69d6ee2b7
|
Merge branch 'dev-lzh-09051' into dev
|
2025-10-17 15:55:43 +08:00 |
|
|
|
1ed1085d0f
|
1
|
2025-10-17 15:48:41 +08:00 |
|
|
|
5269d7e24c
|
bugfix: 根据余额表细分的情况，将任务表细分，并添加任务余额表，不依赖套餐余额
|
2025-10-17 14:25:41 +08:00 |
|
|
|
3dc530db91
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-17 13:29:58 +08:00 |
|
|
|
4939c916ef
|
支持默认布局
|
2025-10-17 13:29:52 +08:00 |
|
|
|
2dde055ead
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-17 10:26:22 +08:00 |
|
|
|
78d1935065
|
添加表格布局存储
|
2025-10-17 10:15:24 +08:00 |
|
|
|
6d0ccb0c9d
|
Merge branch 'main' into feat-cjy-taskBench
# Conflicts:
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
|
2025-10-16 16:45:28 +08:00 |
|
|
|
205564cb00
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-16 16:37:44 +08:00 |
|
|
|
1ba0cce450
|
excel导出接口
|
2025-10-16 16:37:38 +08:00 |
|
|
|
6b12c7441d
|
bugfix:修改关于时间区间的处理
|
2025-10-16 16:16:50 +08:00 |
|
|
|
b82f4159ba
|
bugfix: 修复查询报错
|
2025-10-16 16:16:50 +08:00 |
|
|
|
6e55cfcf89
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-16 09:41:58 +08:00 |
|
|
|
37fa991a9f
|
修改激活接口
|
2025-10-16 09:41:52 +08:00 |
|
|
|
8018d286aa
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-16 09:37:58 +08:00 |
|
