Commit Graph

290 Commits

Author SHA1 Message Date
lzh
ea00e1e361 1 2025-10-10 17:03:05 +08:00
lzh
3324129ed2 更新 2025-10-10 16:30:17 +08:00
lzh
bcc418a55f 1 2025-10-09 17:03:55 +08:00
lzh
6907e59e2e 首次激活重新计算余量时长 2025-09-28 16:30:20 +08:00
lzh
84e78bc808 1 2025-09-28 14:27:02 +08:00
lzh
bbd69e32b3 Merge branch 'jng' into dev-lzh-0905 2025-09-24 15:03:03 +08:00
lzh
ce243c39b8 修改新的余量表 2025-09-24 15:00:51 +08:00
lzh
8b35ba97c8 使用秒级时间戳 2025-09-24 11:40:45 +08:00
lzh
cf07e0d29b 时间过滤条件修改 2025-09-24 11:34:57 +08:00
lzh
ec1e99ec42 添加作品提交时间 2025-09-23 14:17:32 +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
jiaji.H
6e2bff33da Updata:解决冲突 2025-09-15 15:08:50 +08:00
jiaji.H
7c08286128 feat:添加套餐权益与附加套餐权益合理性验证 2025-09-15 13:53:32 +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
jiaji.H
9635ec4572 Updata:区分套餐权益和附加权益 2025-09-11 14:54:21 +08:00
lzh
1d6b207aea 添加套餐激活状态 2025-09-05 14:58:28 +08:00
cjy
b6dd26f8a3 Merge branch 'feat-cjy-taskBanch' into dev 2025-09-04 19:02:39 +08:00
cjy
c18f4162ff bugfix:修改关于时间区间的处理 2025-09-04 19:01:15 +08:00
jiaji.H
e5d4e80e19 feat:解决冲突 2025-09-04 11:41:12 +08:00
cjy
ab79bf6e89 bugfix:增加模糊查询艺人名字 2025-09-03 17:54:16 +08:00
cjy
478c553c37 Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
#	pb/bundle/bundle.pb.go
#	pb/bundle/bundle_triple.pb.go
2025-09-03 16:23:56 +08:00
cjy
019197fc15 feat: 新增任务台功能
新增任务管理台功能
2025-09-03 15:51:35 +08:00
jiaji.H
1c148b0078 feat:增加对增值服务的名称和类型筛选以及额度字段和是否过期作废字段展示 2025-09-03 15:21:02 +08:00
567f70c610 Merge branch 'jng' into dev 2025-07-16 19:01:27 +08:00
2edf4b82ae 修改 2025-07-16 19:01:04 +08:00
567503bcd6 Merge branch 'jng' into dev 2025-07-16 18:18:44 +08:00
145486aec2 修改 2025-07-16 18:18:24 +08:00
6cf7804b39 修改 2025-07-16 17:53:27 +08:00
b149446170 修改 2025-07-16 17:52:50 +08:00
24102eccbd 11 2025-07-08 16:16:04 +08:00
dad01f7f85 解决冲突 2025-07-08 16:12:50 +08:00
383a64077d 添加手续费 2025-07-08 16:12:16 +08:00
de204751ac 修改 2025-07-08 15:10:45 +08:00
2e845b4fe1 修改 2025-07-08 15:10:26 +08:00
1dada43e0c 解决冲突 2025-07-07 19:34:57 +08:00
402a7644e6 fix: 提交支持自动创建用户和订单代码 2025-07-07 13:31:17 +08:00
d5e4c9590f Merge branch 'jng' 2025-07-03 16:11:44 +08:00
bda31412ee Merge branch 'jng' into dev 2025-07-03 14:31:35 +08:00
e9f12cd0eb 111 2025-07-03 14:28:09 +08:00
e7a5e19472 添加手续费字段 2025-07-03 14:02:25 +08:00
76e2b893a1 解决冲突 2025-07-02 15:30:51 +08:00
641c10aec2 解决冲突 2025-07-02 14:01:44 +08:00
0f40072e22 添加支付时间筛选 2025-07-02 14:00:54 +08:00
57a3154634 fix: 拦截重复回调 2025-06-27 20:03:21 +08:00
lzh
40b3d8ddde Merge branch 'dev-lzh' into dev 2025-06-27 17:57:24 +08:00