|
|
0c61b17eeb
|
补全导出查询字段
|
2025-10-24 17:01:49 +08:00 |
|
|
|
533df366d4
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-24 16:39:09 +08:00 |
|
|
|
ea70744f36
|
单价保留两位小数
|
2025-10-24 16:39:02 +08:00 |
|
|
|
9d2ccbd0c1
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-24 15:03:54 +08:00 |
|
|
|
89a802a8bf
|
余量导出添加参数
|
2025-10-24 15:01:56 +08:00 |
|
|
|
d980edc2d5
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-24 11:54:06 +08:00 |
|
|
|
3461c75c04
|
余量统计问题修复
|
2025-10-24 11:53:45 +08:00 |
|
|
|
f2192dadc0
|
Merge branch 'dev-lzh-0905' into dev
|
2025-10-24 10:20:12 +08:00 |
|
|
|
7123333344
|
优化增加余量字段
|
2025-10-24 10:20:04 +08:00 |
|
|
|
23419fd40c
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-23 14:53:36 +08:00 |
|
|
|
be78b69db4
|
bugfix： 更新待发任务时，同时修改最后一次指派人和进行中的任务数量和已完成任务数量。
员工手动点击完成任务，同时更新任务管理表中进行中的任务和代办任务数量。如果当前登录人查询自己已完成任务，就返回当初指派时的数量，而不是待完成任务。
|
2025-10-23 14:53:15 +08:00 |
|
|
|
aea3db29bc
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 19:40:43 +08:00 |
|
|
|
441f2e4fc0
|
bugfix: 把手动扩展任务数量也计算如到增值任务余额。修改扣减任务数量的顺序
|
2025-10-22 19:40:09 +08:00 |
|
|
|
4ef0cdd7c9
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 16:04:20 +08:00 |
|
|
|
a671df3c25
|
bugfix : 修改报错提示语
|
2025-10-22 16:04:05 +08:00 |
|
|
|
a88cc56f24
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-10-22 15:54:15 +08:00 |
|
|
|
6decfdca6f
|
bugfix: 套餐过期后，不能完成过期艺人的任务
|
2025-10-22 15:54:03 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
