|
|
26044470f0
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-21 10:11:45 +08:00 |
|
|
|
4d8203bf8c
|
增加 dto 用来放请求参数
|
2026-01-21 10:11:36 +08:00 |
|
|
|
eb6a6363ef
|
Merge branch 'feat-hjj-Competitors#A203' into dev
# Conflicts:
# pkg/cron/cron.go
|
2026-01-21 10:02:08 +08:00 |
|
|
|
2a75c3eb78
|
移除没用的代码
|
2026-01-20 17:30:54 +08:00 |
|
jiaji.H
|
d00bb4ddbc
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-20 15:05:30 +08:00 |
|
jiaji.H
|
278606b5e7
|
Updata：修改季度发放余量逻辑
|
2026-01-20 15:05:19 +08:00 |
|
jiaji.H
|
d4d4e262f7
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-19 13:20:13 +08:00 |
|
jiaji.H
|
cd261657fd
|
Updata：增加竞品数异常发布统计
|
2026-01-19 13:20:03 +08:00 |
|
jiaji.H
|
bd8bd41a2c
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-19 09:37:46 +08:00 |
|
jiaji.H
|
54296dd70a
|
Updata：修改手动扩展计费类型
|
2026-01-19 09:36:15 +08:00 |
|
jiaji.H
|
e170a086af
|
Updata：修正sql
|
2026-01-16 11:42:01 +08:00 |
|
jiaji.H
|
899c20d6c3
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-15 13:19:42 +08:00 |
|
jiaji.H
|
cbe50785c3
|
Fix:修正sql
|
2026-01-15 13:19:24 +08:00 |
|
jiaji.H
|
70a99bdf14
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-15 13:16:08 +08:00 |
|
jiaji.H
|
bf4aa92713
|
fix：修正sql
|
2026-01-15 13:15:57 +08:00 |
|
jiaji.H
|
0ff38110f4
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-15 13:11:24 +08:00 |
|
jiaji.H
|
c4571c8bef
|
Updata：更新sql
|
2026-01-15 13:11:11 +08:00 |
|
jiaji.H
|
ff08d4618e
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-15 11:47:34 +08:00 |
|
jiaji.H
|
a89e39abc5
|
Updata：修正sql
|
2026-01-15 11:47:17 +08:00 |
|
jiaji.H
|
e9d6bf458a
|
Updata：解决冲突
|
2026-01-15 11:32:11 +08:00 |
|
jiaji.H
|
508f714dae
|
Updata:增加竞品数数据指标
|
2026-01-15 11:08:32 +08:00 |
|
jiaji.H
|
3abd57aa9a
|
Updata：解决冲突
|
2026-01-14 13:33:23 +08:00 |
|
jiaji.H
|
c0bfd322a8
|
Merge branch 'feat-hjj-ExportManager'
|
2026-01-14 09:22:06 +08:00 |
|
jiaji.H
|
e9bef82968
|
Updata：更新sql
|
2026-01-14 09:21:51 +08:00 |
|
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
|
36a751b8ac
|
Updata：解决冲突
|
2026-01-13 16:39:08 +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
|
94258657e7
|
Updata：解决冲突
|
2026-01-13 09:43:01 +08:00 |
|
jiaji.H
|
debb225291
|
Updata：解决冲突
|
2026-01-13 09:38:41 +08:00 |
|
|
|
8b85aeee28
|
11
|
2026-01-12 18:08:45 +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
|
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 |
|
