Commit Graph

274 Commits

Author SHA1 Message Date
cjy
aea3db29bc Merge branch 'feat-cjy-taskBench' into dev 2025-10-22 19:40:43 +08:00
cjy
441f2e4fc0 bugfix: 把手动扩展任务数量也计算如到增值任务余额。修改扣减任务数量的顺序 2025-10-22 19:40:09 +08:00
cjy
4ef0cdd7c9 Merge branch 'feat-cjy-taskBench' into dev 2025-10-22 16:04:20 +08:00
cjy
a671df3c25 bugfix : 修改报错提示语 2025-10-22 16:04:05 +08:00
cjy
a88cc56f24 Merge branch 'feat-cjy-taskBench' into dev 2025-10-22 15:54:15 +08:00
cjy
6decfdca6f bugfix: 套餐过期后,不能完成过期艺人的任务 2025-10-22 15:54:03 +08:00
lzh
cbdeedc1c5 Merge branch 'dev-lzh-0905' into dev 2025-10-22 14:34:31 +08:00
lzh
66ee049376 固定初始字段顺序 2025-10-22 14:34:22 +08:00
cjy
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
cjy
7748878608 bugfix: 实现和余额表同步以及把修改待发数据的接口与申诉合并 2025-10-21 20:09:01 +08:00
cjy
387df055ee Merge branch 'feat-cjy-taskBench' into dev 2025-10-21 17:50:25 +08:00
cjy
142bf642dd bugfix:去掉任务管理表中任务字段 2025-10-21 17:50:04 +08:00
lzh
18ba745611 Merge branch 'dev-lzh-0905' into dev 2025-10-21 17:08:17 +08:00
lzh
404ddc9cf8 扩展时间修改 2025-10-21 17:08:03 +08:00
lzh
c67ea8668b Merge branch 'dev-lzh-0905' into dev 2025-10-21 17:03:34 +08:00
lzh
f774a5ad06 修改手动扩展 2025-10-21 17:03:28 +08:00
lzh
9d5cc117b9 Merge branch 'dev-lzh-0905' into dev 2025-10-21 16:40:00 +08:00
lzh
ef1a9ab5de 使用余量修改 2025-10-21 16:39:51 +08:00
lzh
a47421f758 Merge branch 'dev-lzh-0905' into dev 2025-10-21 15:43:55 +08:00
lzh
60d56109fe 余量查询最新月份 2025-10-21 15:43:43 +08:00
lzh
4359e001ea Merge branch 'dev-lzh-0905' into dev 2025-10-21 13:40:55 +08:00
lzh
8381244d86 余量计算修改 2025-10-21 13:40:47 +08:00
lzh
a8ffa7b798 Merge branch 'dev-lzh-0905' into dev 2025-10-21 13:30:20 +08:00
lzh
49a96cbadc 1 2025-10-21 13:30:14 +08:00
lzh
78e41e8a1c Merge branch 'dev-lzh-0905' into dev 2025-10-21 11:33:42 +08:00
lzh
17d4581092 修改扩展接口 2025-10-21 11:33:31 +08:00
lzh
39d899288a Merge branch 'dev-lzh-0905' into dev 2025-10-21 10:47:16 +08:00
lzh
f5b64a3d86 解决NAN错误 2025-10-21 10:47:08 +08:00
lzh
8700778baa Merge branch 'dev-lzh-0905' into dev 2025-10-21 10:19:58 +08:00
lzh
7c30bac725 余量信息修订 2025-10-21 10:19:48 +08:00
lzh
6cfbf9e079 Merge branch 'dev-lzh-0905' into dev 2025-10-20 17:02:08 +08:00
lzh
36ef189971 补充余量信息字段 2025-10-20 16:59:40 +08:00
lzh
5ec0375d2a 补充余量信息字段 2025-10-20 16:56:59 +08:00
cjy
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
lzh
be4f88e943 Merge branch 'dev-lzh-0905' into dev 2025-10-17 16:00:01 +08:00
lzh
4897fbe098 修改字段类型 2025-10-17 15:59:50 +08:00
cjy
5269d7e24c bugfix: 根据余额表细分的情况,将任务表细分,并添加任务余额表,不依赖套餐余额 2025-10-17 14:25:41 +08:00
lzh
3dc530db91 Merge branch 'dev-lzh-0905' into dev 2025-10-17 13:29:58 +08:00
lzh
4939c916ef 支持默认布局 2025-10-17 13:29:52 +08:00
lzh
2dde055ead Merge branch 'dev-lzh-0905' into dev 2025-10-17 10:26:22 +08:00
lzh
78d1935065 添加表格布局存储 2025-10-17 10:15:24 +08:00
cjy
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
lzh
205564cb00 Merge branch 'dev-lzh-0905' into dev 2025-10-16 16:37:44 +08:00
lzh
1ba0cce450 excel导出接口 2025-10-16 16:37:38 +08:00
lzh
51db761716 Merge branch 'dev-lzh-0905' into dev 2025-10-15 15:52:57 +08:00
lzh
c69a5d8c14 1 2025-10-15 15:52:53 +08:00
lzh
b01909e7f8 Merge branch 'dev-lzh-0905' into dev 2025-10-15 15:48:06 +08:00
lzh
9e4fb0543c 1 2025-10-14 16:47:13 +08:00
lzh
f4d6345707 套餐使用情况 2025-10-14 16:44:43 +08:00
lzh
12301aef82 余量查询接口 2025-10-13 16:44:55 +08:00