|
|
40badd2edf
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 15:20:51 +08:00 |
|
|
|
3930d1fb5b
|
bugfix: 如果是查询已完成，就按照完成时间降序返回
|
2025-10-22 15:20:30 +08:00 |
|
|
|
cbdeedc1c5
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-22 14:34:31 +08:00 |
|
|
|
66ee049376
|
固定初始字段顺序
|
2025-10-22 14:34:22 +08:00 |
|
|
|
509ebb61a6
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 14:08:09 +08:00 |
|
|
|
9ffca3094b
|
bugfix: 修改指派扣减逻辑
|
2025-10-22 14:07:49 +08:00 |
|
|
|
483314d2c4
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 13:06:10 +08:00 |
|
|
|
3638845d6e
|
bugfix: 完成数量超过限制不报错
|
2025-10-22 13:05:50 +08:00 |
|
|
|
947651ea3f
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 12:46:45 +08:00 |
|
|
|
0e284a8d6f
|
bugfix： 修复查询待发数量、修复初次启动时数据同步的问题
|
2025-10-22 12:45:54 +08:00 |
|
|
|
2b60f44b85
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 10:24:06 +08:00 |
|
|
|
854cb61551
|
bugfix: 修复初次同步
|
2025-10-22 10:23:44 +08:00 |
|
|
|
58e429ad0c
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-22 10:17:39 +08:00 |
|
|
|
16cb0245cf
|
修复时间类型扩展
|
2025-10-22 10:17:28 +08:00 |
|
|
|
7fe2038dcb
|
Reapply "feat: 购买套餐和扩展套餐余额时同步任务余额"
This reverts commit aa7de9e4f6.
|
2025-10-22 10:07:37 +08:00 |
|
|
|
aa7de9e4f6
|
Revert "feat: 购买套餐和扩展套餐余额时同步任务余额"
This reverts commit 48039127e1.
|
2025-10-22 09:08:19 +08:00 |
|
|
|
48039127e1
|
feat: 购买套餐和扩展套餐余额时同步任务余额
|
2025-10-22 08:56:50 +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 |
|
|
|
387df055ee
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-21 17:50:25 +08:00 |
|
|
|
142bf642dd
|
bugfix:去掉任务管理表中任务字段
|
2025-10-21 17:50:04 +08:00 |
|
|
|
a1ccdeb58b
|
过滤软删除类型
|
2025-10-21 17:20:32 +08:00 |
|
|
|
18ba745611
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 17:08:17 +08:00 |
|
|
|
404ddc9cf8
|
扩展时间修改
|
2025-10-21 17:08:03 +08:00 |
|
|
|
c67ea8668b
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 17:03:34 +08:00 |
|
|
|
f774a5ad06
|
修改手动扩展
|
2025-10-21 17:03:28 +08:00 |
|
|
|
9d5cc117b9
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 16:40:00 +08:00 |
|
|
|
ef1a9ab5de
|
使用余量修改
|
2025-10-21 16:39:51 +08:00 |
|
|
|
a47421f758
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 15:43:55 +08:00 |
|
|
|
60d56109fe
|
余量查询最新月份
|
2025-10-21 15:43:43 +08:00 |
|
|
|
60f4775cbc
|
过滤删除的条目
|
2025-10-21 14:50:56 +08:00 |
|
|
|
71f9b24935
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 14:21:14 +08:00 |
|
|
|
61441bd201
|
bug修复
|
2025-10-21 14:21:04 +08:00 |
|
|
|
4359e001ea
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 13:40:55 +08:00 |
|
|
|
8381244d86
|
余量计算修改
|
2025-10-21 13:40:47 +08:00 |
|
|
|
a8ffa7b798
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 13:30:20 +08:00 |
|
|
|
49a96cbadc
|
1
|
2025-10-21 13:30:14 +08:00 |
|
|
|
78e41e8a1c
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 11:33:42 +08:00 |
|
|
|
17d4581092
|
修改扩展接口
|
2025-10-21 11:33:31 +08:00 |
|
|
|
39d899288a
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 10:47:16 +08:00 |
|
|
|
f5b64a3d86
|
解决NAN错误
|
2025-10-21 10:47:08 +08:00 |
|
|
|
8700778baa
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 10:19:58 +08:00 |
|
|
|
7c30bac725
|
余量信息修订
|
2025-10-21 10:19:48 +08:00 |
|
|
|
54b5668049
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-21 10:02:30 +08:00 |
|
|
|
23e3d3371f
|
扩展修订
|
2025-10-21 09:59:55 +08:00 |
|
|
|
ed629f515f
|
过滤被删除的订单
|
2025-10-21 09:38:42 +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 |
|
