|
|
9d2ccbd0c1
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-24 15:03:54 +08:00 |
|
|
|
89a802a8bf
|
余量导出添加参数
|
2025-10-24 15:01:56 +08:00 |
|
|
|
b6d7271420
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
# pkg/cron/cron.go
|
2025-10-21 20:29:28 +08:00 |
|
|
|
7748878608
|
bugfix: 实现和余额表同步以及把修改待发数据的接口与申诉合并
|
2025-10-21 20:09:01 +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 |
|
|
|
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 |
|
|
|
4897fbe098
|
修改字段类型
|
2025-10-17 15:59:50 +08:00 |
|
|
|
5269d7e24c
|
bugfix: 根据余额表细分的情况，将任务表细分，并添加任务余额表，不依赖套餐余额
|
2025-10-17 14:25:41 +08:00 |
|
|
|
4939c916ef
|
支持默认布局
|
2025-10-17 13:29:52 +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 |
|
|
|
1ba0cce450
|
excel导出接口
|
2025-10-16 16:37:38 +08:00 |
|
|
|
8bdc5982df
|
Merge branch 'dev-lzh-1009' into dev-lzh-0905
|
2025-10-15 15:46:53 +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 |
|
|
|
6c5ae80059
|
添加使用类型过滤
|
2025-10-10 14:14:13 +08:00 |
|
|
|
24e1eaed14
|
新增使用类型字段
|
2025-10-10 10:24:20 +08:00 |
|
|
|
422d2acb5a
|
添加使用类型字段
|
2025-10-09 17:09:43 +08:00 |
|
|
|
5edac38772
|
更新proto
|
2025-09-28 14:18:11 +08:00 |
|
|
|
bbd69e32b3
|
Merge branch 'jng' into dev-lzh-0905
|
2025-09-24 15:03:03 +08:00 |
|
|
|
1112d253ee
|
格式化提交时间
|
2025-09-24 11:22:39 +08:00 |
|
|
|
9b37dab44f
|
添加确认时间字段
|
2025-09-23 14:23:24 +08:00 |
|
jiaji.H
|
cf427ec269
|
Updata：解决冲突
|
2025-09-17 11:20:49 +08:00 |
|
jiaji.H
|
5f4e1610d3
|
Updata：增加注释
|
2025-09-17 11:20:01 +08:00 |
|
jiaji.H
|
5fd972942b
|
Updata:订单添加增值服务信息
|
2025-09-17 11:16:22 +08:00 |
|
jiaji.H
|
95a6219fd7
|
Updata：解决冲突
|
2025-09-16 13:47:01 +08:00 |
|
jiaji.H
|
1b9a64068a
|
Upfata：新增套餐字段添加
|
2025-09-16 13:25:32 +08:00 |
|
|
|
ec5abc5fe4
|
解决冲突
|
2025-09-15 19:07:25 +08:00 |
|
|
|
897f375130
|
11
|
2025-09-15 19:07:00 +08:00 |
|
jiaji.H
|
6e2bff33da
|
Updata：解决冲突
|
2025-09-15 15:08:50 +08:00 |
|
jiaji.H
|
7edef20a45
|
feat：返回值中添加服务默认数量
|
2025-09-15 14:55:54 +08:00 |
|
jiaji.H
|
75de934c4f
|
feat：新增加服务添加是否默认选项
|
2025-09-15 14:33:26 +08:00 |
|
jiaji.H
|
bca70c5493
|
Updata：解决冲突
|
2025-09-11 15:32:15 +08:00 |
|
jiaji.H
|
9635ec4572
|
Updata：区分套餐权益和附加权益
|
2025-09-11 14:54:21 +08:00 |
|
|
|
0dcbb3a057
|
解决冲突
|
2025-09-11 14:54:12 +08:00 |
|
|
|
64c56d5ca3
|
单价模式新加总价字段
|
2025-09-11 14:47:07 +08:00 |
|
jiaji.H
|
4d42019882
|
feat：分类权益
|
2025-09-10 13:55:41 +08:00 |
|
jiaji.H
|
5d47d6f1a9
|
feat:解决冲突
|
2025-09-09 11:02:31 +08:00 |
|
jiaji.H
|
2461bb8a93
|
feat：修改服务列表额度字段逻辑
|
2025-09-09 10:59:23 +08:00 |
|
|
|
1d6b207aea
|
添加套餐激活状态
|
2025-09-05 14:58:28 +08:00 |
|
jiaji.H
|
e5d4e80e19
|
feat：解决冲突
|
2025-09-04 11:41:12 +08:00 |
|
jiaji.H
|
4b999f57c4
|
Updata：更新pb文件
|
2025-09-04 11:34:13 +08:00 |
|
|
|
019197fc15
|
feat: 新增任务台功能
新增任务管理台功能
|
2025-09-03 15:51:35 +08:00 |
|
jiaji.H
|
1c148b0078
|
feat：增加对增值服务的名称和类型筛选以及额度字段和是否过期作废字段展示
|
2025-09-03 15:21:02 +08:00 |
|
jiaji.H
|
0c7f70af93
|
feat:增加额度对应需求字段
|
2025-09-03 11:33:05 +08:00 |
|
