|
|
4687a172f2
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-22 15:23:06 +08:00 |
|
|
|
cc6f1577a1
|
手动扩展类型算作增值类型
|
2025-10-22 15:22:54 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
fb085348dc
|
解决冲突
|
2025-10-20 15:20:26 +08:00 |
|
|
|
af4ad3339f
|
订单详情添加类型
|
2025-10-20 15:19:59 +08:00 |
|
|
|
f8c5105580
|
修改余量创建
|
2025-10-20 14:21:31 +08:00 |
|
|
|
426334fa3d
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-20 11:52:50 +08:00 |
|
|
|
3e1739d5c0
|
bugfix: 添加进行中的任务和已完成任务数量排序。修改报错提示
|
2025-10-20 11:52:28 +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 |
|
|
|
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 |
|
|
|
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 |
|
