jiaji.H
|
445695ef29
|
Merge branch 'feat-hjj-ExportManager' into dev
|
2026-01-14 09:16:55 +08:00 |
|
jiaji.H
|
aae7aa077b
|
Updata：更新sql
|
2026-01-14 09:16:34 +08:00 |
|
jiaji.H
|
e4a8968a4c
|
Merge branch 'feat-hjj-ExportManager' into dev
|
2026-01-14 09:12:28 +08:00 |
|
jiaji.H
|
61e5a69484
|
Updata：更新sql
|
2026-01-14 09:12:17 +08:00 |
|
jiaji.H
|
5a91f8bd14
|
Merge branch 'feat-hjj-ExportManager' into dev
|
2026-01-14 09:08:25 +08:00 |
|
jiaji.H
|
0524d503f3
|
Updata：增加套餐过期过虑
|
2026-01-14 09:08:06 +08:00 |
|
jiaji.H
|
c92d48862a
|
Merge branch 'feat-hjj-ExportManager' into dev
|
2026-01-13 14:44:33 +08:00 |
|
jiaji.H
|
7f5384c935
|
fix：修正bug
|
2026-01-13 14:44:18 +08:00 |
|
jiaji.H
|
ea7b94baf0
|
Updata：解决冲突
|
2026-01-13 14:13:54 +08:00 |
|
jiaji.H
|
137e752c1b
|
Updata：导出支持选择多个月份进行导出
|
2026-01-13 13:50:58 +08:00 |
|
jiaji.H
|
6433b28072
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-12 15:12:07 +08:00 |
|
jiaji.H
|
8536070eea
|
Updata：增加每月季度发放竞品数函数
|
2026-01-12 15:07:23 +08:00 |
|
|
|
25d37da088
|
解决冲突
|
2026-01-12 14:38:06 +08:00 |
|
|
|
bbe0c0390c
|
11
|
2026-01-12 14:36:20 +08:00 |
|
jiaji.H
|
8b6f5da73b
|
Updata：解决冲突
|
2026-01-12 13:40:37 +08:00 |
|
jiaji.H
|
cb8305f83b
|
Updata：去除微服务中的余量更新定时任务
|
2026-01-12 13:39:48 +08:00 |
|
jiaji.H
|
c4ec01846f
|
Updata:调整余量更新定时任务至客户端
|
2026-01-12 13:28:47 +08:00 |
|
jiaji.H
|
bf41622eab
|
Updata：更新创建每月数据的时间
|
2026-01-09 16:48:33 +08:00 |
|
jiaji.H
|
7ac61c197c
|
Updata：解决冲突
|
2026-01-09 13:16:28 +08:00 |
|
jiaji.H
|
b8aa941f75
|
Updata：解决冲突
|
2026-01-09 11:36:44 +08:00 |
|
jiaji.H
|
e5baa91e9d
|
Updata：增加youtube和bluesky账号数据导出
|
2026-01-09 11:23:53 +08:00 |
|
|
|
3584a9f948
|
Merge branch 'fix-cjy-workNum'
|
2026-01-07 13:22:47 +08:00 |
|
|
|
4f01d924d6
|
fix:过滤user表和real_name 表软删除的记录
# Conflicts:
# internal/dao/taskDao.go
|
2026-01-07 13:11:17 +08:00 |
|
|
|
fc25533193
|
fix:过滤user表和real_name 表软删除的记录
# Conflicts:
# internal/dao/taskDao.go
|
2026-01-07 13:10:56 +08:00 |
|
|
|
fa79376e51
|
Merge branch 'feat-zjy-fixbug-023' into dev
# Conflicts:
# internal/dao/bundleExtend.go
|
2026-01-07 10:53:29 +08:00 |
|
|
|
71f7be5716
|
fix: 支付回调，更新手续费
|
2026-01-07 10:50:51 +08:00 |
|
|
|
55a5ba3152
|
Merge branch 'jng'
|
2026-01-06 11:31:39 +08:00 |
|
|
|
ebf579a1a9
|
Merge branch 'jng' into dev
|
2026-01-05 15:16:43 +08:00 |
|
|
|
185e5da57a
|
Update bundle_order_records.go
|
2026-01-05 15:16:37 +08:00 |
|
jiaji.H
|
a795b5b491
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-05 13:47:38 +08:00 |
|
jiaji.H
|
55d1554e13
|
Updata：修正查询sql
|
2026-01-05 13:46:25 +08:00 |
|
jiaji.H
|
3b9661f03b
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-05 11:40:44 +08:00 |
|
jiaji.H
|
b9c44fdc7e
|
Updata：修正sql
|
2026-01-05 11:40:34 +08:00 |
|
jiaji.H
|
7b7ddd9613
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-05 11:24:07 +08:00 |
|
jiaji.H
|
5ad9417042
|
Updata:导出补充竞品数字段
|
2026-01-05 11:23:55 +08:00 |
|
jiaji.H
|
fbd3c97547
|
Updata:解决冲突
|
2026-01-05 10:45:33 +08:00 |
|
jiaji.H
|
65ffc2c43a
|
Updata
|
2026-01-04 16:22:50 +08:00 |
|
jiaji.H
|
44c4a8627c
|
Updata：修正数据分析发放值
|
2026-01-04 16:22:18 +08:00 |
|
jiaji.H
|
7c4c7b0faa
|
Updata：更新余量定时任务发放数
|
2026-01-04 16:20:34 +08:00 |
|
jiaji.H
|
9632dc121a
|
Merge branch 'feat-hjj-BalanceManager' into dev
|
2026-01-04 16:02:01 +08:00 |
|
jiaji.H
|
8f5c21e3f2
|
Updata:修正bug
|
2026-01-04 16:01:51 +08:00 |
|
|
|
f228f73ef3
|
解决冲突
|
2026-01-04 15:13:08 +08:00 |
|
|
|
d730106309
|
添加自媒体账号选择
|
2026-01-04 15:11:45 +08:00 |
|
jiaji.H
|
f40fc853de
|
feat:列表布局增加竞品数字段
|
2026-01-04 14:32:08 +08:00 |
|
jiaji.H
|
2a75b9b6db
|
Updata：套餐与余量增加竞品数字段与对应功能
|
2026-01-04 11:12:34 +08:00 |
|
|
|
64a11237a3
|
fix: 修复重复引用
|
2025-12-28 13:00:47 +08:00 |
|
|
|
b8dfc8a6e6
|
Merge branch 'feat-cjy-taskLog' into dev
# Conflicts:
# internal/logic/bundleExtendLogic.go
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
# pkg/msg/msg.go
|
2025-12-28 12:56:46 +08:00 |
|
|
|
0bf1f34bba
|
feat: 增加日志创建
|
2025-12-28 11:40:57 +08:00 |
|
jiaji.H
|
32a9bb8283
|
Updata：修正套餐状态判断
|
2025-12-26 16:51:16 +08:00 |
|
jiaji.H
|
0e64d40489
|
Updata：增加套餐类型字段
|
2025-12-26 14:24:05 +08:00 |
|
