|
|
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 |
|
|
|
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 |
|
|
|
8b6b184863
|
修改激活接口
|
2025-10-16 09:37:48 +08:00 |
|
|
|
d58f0e574a
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-16 09:32:53 +08:00 |
|
|
|
c4affb238c
|
修改激活接口
|
2025-10-16 09:32:47 +08:00 |
|
|
|
34f2225568
|
1
|
2025-10-15 15:53:59 +08:00 |
|
|
|
51db761716
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-15 15:52:57 +08:00 |
|
|
|
c69a5d8c14
|
1
|
2025-10-15 15:52:53 +08:00 |
|
|
|
b01909e7f8
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-15 15:48:06 +08:00 |
|
|
|
8bdc5982df
|
Merge branch 'dev-lzh-1009' into dev-lzh-0905
|
2025-10-15 15:46:53 +08:00 |
|
|
|
53bf31865a
|
拓展时间修改
|
2025-10-15 15:01:47 +08:00 |
|
|
|
fc7c88c85f
|
新的套餐扩展
|
2025-10-15 14:41:38 +08:00 |
|
|
|
9e4fb0543c
|
1
|
2025-10-14 16:47:13 +08:00 |
|
|
|
f4d6345707
|
套餐使用情况
|
2025-10-14 16:44:43 +08:00 |
|
|
|
12301aef82
|
余量查询接口
|
2025-10-13 16:44:55 +08:00 |
|
|
|
cae2e19a96
|
添加每月余量更新
|
2025-10-13 14:15:37 +08:00 |
|
jiaji.H
|
d1647bb9cf
|
Merge branch 'feat-hjj-packageManage#A116' into dev
|
2025-10-13 09:57:36 +08:00 |
|
jiaji.H
|
f1b0c0d388
|
Updata:更新错误返回信息
|
2025-10-13 09:57:23 +08:00 |
|
jiaji.H
|
7fe3cfe17b
|
Merge branch 'feat-hjj-packageManage#A116' into dev
|
2025-10-11 16:52:33 +08:00 |
|
jiaji.H
|
d915175416
|
Updata：修正分页返回数据错误
|
2025-10-11 16:52:23 +08:00 |
|
jiaji.H
|
06bf3e2bc8
|
Merge branch 'feat-hjj-packageManage#A116' into dev
|
2025-10-11 13:29:23 +08:00 |
|
jiaji.H
|
2fd0f940a0
|
Updata：添加初始额度类型限制逻辑
|
2025-10-11 13:29:12 +08:00 |
|
