|
|
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 |
|
jiaji.H
|
9a2822298c
|
Merge branch 'feat-hjj-packageManage#A116' into dev
|
2025-10-11 11:32:38 +08:00 |
|
jiaji.H
|
62755cc884
|
Updata：补充套餐更新逻辑
|
2025-10-11 11:32:23 +08:00 |
|
|
|
6cded5543f
|
过滤软删除
|
2025-10-10 17:11:55 +08:00 |
|
|
|
f0dbb9c9be
|
过滤重复作品
|
2025-10-10 17:07:43 +08:00 |
|
|
|
ea00e1e361
|
1
|
2025-10-10 17:03:05 +08:00 |
|
|
|
76390c3f66
|
使用记录查询条件
|
2025-10-10 16:39:19 +08:00 |
|
|
|
3324129ed2
|
更新
|
2025-10-10 16:30:17 +08:00 |
|
|
|
c9663f2bfe
|
Merge branch 'dev-lzh-1009' into dev
|
2025-10-10 14:15:55 +08:00 |
|
|
|
6c5ae80059
|
添加使用类型过滤
|
2025-10-10 14:14:13 +08:00 |
|
|
|
2756006a7f
|
Merge branch 'dev-lzh-1009' into dev
|
2025-10-10 10:31:42 +08:00 |
|
|
|
24e1eaed14
|
新增使用类型字段
|
2025-10-10 10:24:20 +08:00 |
|
|
|
7ea566bd9b
|
Merge branch 'dev-lzh-1009' into dev
|
2025-10-09 17:59:39 +08:00 |
|
|
|
422d2acb5a
|
添加使用类型字段
|
2025-10-09 17:09:43 +08:00 |
|
|
|
bcc418a55f
|
1
|
2025-10-09 17:03:55 +08:00 |
|
|
|
6907e59e2e
|
首次激活重新计算余量时长
|
2025-09-28 16:30:20 +08:00 |
|
|
|
84e78bc808
|
1
|
2025-09-28 14:27:02 +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 |
|
|
|
ce243c39b8
|
修改新的余量表
|
2025-09-24 15:00:51 +08:00 |
|
|
|
b80ce9ec70
|
Merge branch 'dev-lzh-0905' into dev
|
2025-09-24 11:40:57 +08:00 |
|
|
|
8b35ba97c8
|
使用秒级时间戳
|
2025-09-24 11:40:45 +08:00 |
|
|
|
01fa323c4d
|
Merge branch 'dev-lzh-0905' into dev
|
2025-09-24 11:35:04 +08:00 |
|
|
|
cf07e0d29b
|
时间过滤条件修改
|
2025-09-24 11:34:57 +08:00 |
|
|
|
5b9bfc11b1
|
Merge branch 'dev-lzh-0905' into dev
|
2025-09-24 11:23:07 +08:00 |
|
|
|
1112d253ee
|
格式化提交时间
|
2025-09-24 11:22:39 +08:00 |
|
|
|
5d46b21645
|
Merge branch 'dev-lzh-0905' into dev
|
2025-09-23 14:19:20 +08:00 |
|
|
|
ec1e99ec42
|
添加作品提交时间
|
2025-09-23 14:17:32 +08:00 |
|
jiaji.H
|
76e4b7c998
|
Merge branch 'feat-hjj-packageManage#A116' into dev
|
2025-09-19 10:57:12 +08:00 |
|
jiaji.H
|
91fa9afa58
|
Updata：添加套餐数量符号检验
|
2025-09-19 10:54:03 +08:00 |
|
jiaji.H
|
cf427ec269
|
Updata：解决冲突
|
2025-09-17 11:20:49 +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
|
2fc46f8bb7
|
Updata：优化套餐查询逻辑效率
|
2025-09-16 13:45:16 +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
|
7c08286128
|
feat：添加套餐权益与附加套餐权益合理性验证
|
2025-09-15 13:53:32 +08:00 |
|
jiaji.H
|
4e066d88d5
|
Merge branch 'feat-hjj-packageManage#A116' into dev
|
2025-09-12 13:20:46 +08:00 |
|
jiaji.H
|
e406bcc63a
|
Updata：更新套餐类型检索逻辑
|
2025-09-12 13:20:35 +08:00 |
|
jiaji.H
|
0595617645
|
Merge branch 'feat-hjj-packageManage#A116' into dev
|
2025-09-12 10:45:02 +08:00 |
|
jiaji.H
|
51f1c674fa
|
Updata：调整接口名称
|
2025-09-12 10:44:49 +08:00 |
|
jiaji.H
|
9830f38ffb
|
Merge branch 'feat-hjj-packageManage#A116' into dev
|
2025-09-12 10:38:21 +08:00 |
|
jiaji.H
|
66c2669557
|
feat：调整套餐差异更新逻辑
|
2025-09-12 10:37:25 +08:00 |
|
jiaji.H
|
bca70c5493
|
Updata：解决冲突
|
2025-09-11 15:32:15 +08:00 |
|
|
|
479cb7255f
|
Merge branch 'feat-sxy-0911' into dev
|
2025-09-11 15:13:12 +08:00 |
|
|
|
61b7fedf0d
|
修改
|
2025-09-11 15:12:13 +08:00 |
|
|
|
17b557df77
|
修改条件
|
2025-09-11 15:10:26 +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 |
|
jiaji.H
|
49f89d1319
|
Merge branch 'feat-hjj-packageManage#A116' into dev
|
2025-09-09 10:16:23 +08:00 |
|
jiaji.H
|
2280cc40d9
|
Updata：更新数据库字段定义
|
2025-09-09 09:26:21 +08:00 |
|
|
|
1d6b207aea
|
添加套餐激活状态
|
2025-09-05 14:58:28 +08:00 |
|
|
|
73d997f754
|
Merge branch 'feat-cjy-taskBanch' into dev
|
2025-09-05 09:35:14 +08:00 |
|
