|
|
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
|
3abd57aa9a
|
Updata：解决冲突
|
2026-01-14 13:33:23 +08:00 |
|
jiaji.H
|
36a751b8ac
|
Updata：解决冲突
|
2026-01-13 16:39:08 +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 |
|
|
|
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
|
c4ec01846f
|
Updata:调整余量更新定时任务至客户端
|
2026-01-12 13:28:47 +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 |
|
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 |
|
|
|
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 |
|
|
|
d11a7a5c6a
|
解决冲突
|
2025-12-26 11:43:26 +08:00 |
|
|
|
bfffc58e16
|
解决冲突
|
2025-12-25 18:45:09 +08:00 |
|
|
|
fa640ed8ef
|
修改合同签署
|
2025-12-25 18:44:43 +08:00 |
|
jiaji.H
|
512c3683ef
|
Updata：解决冲突
|
2025-12-18 17:26:22 +08:00 |
|
jiaji.H
|
da925cc342
|
Updata：增加套餐状态
|
2025-12-18 17:24:56 +08:00 |
|
jiaji.H
|
c5e9c42ffd
|
Updata：更新逻辑
|
2025-12-17 16:24:02 +08:00 |
|
jiaji.H
|
c5b63de30a
|
Updata：更新sql
|
2025-12-17 16:16:41 +08:00 |
|
jiaji.H
|
7d758b1b89
|
Updata：解决冲突
|
2025-12-17 10:59:44 +08:00 |
|
jiaji.H
|
065ac39c05
|
Updata：增加字段
|
2025-12-17 10:58:36 +08:00 |
|
jiaji.H
|
0ad0b78e0a
|
Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' into dev
|
2025-12-16 16:02:53 +08:00 |
|
jiaji.H
|
b345333255
|
Updata：补充代码
|
2025-12-16 16:02:38 +08:00 |
|
jiaji.H
|
bb5a8a9547
|
Updata：增加获取待确认列表
|
2025-12-16 16:01:30 +08:00 |
|
jiaji.H
|
e08bdb3937
|
Updata:更新增加获取
|
2025-12-16 15:59:45 +08:00 |
|
|
|
1b2e5f8fd1
|
11
|
2025-12-09 11:07:16 +08:00 |
|
|
|
0bef1ca389
|
Merge branch 'feat-cjy-taskBench'
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-12-01 10:22:47 +08:00 |
|
|
|
18530c60cd
|
feat: 增加一个接口
|
2025-11-29 17:00:57 +08:00 |
|
|
|
4152832b11
|
Merge branch 'feat-cjy-taskBench'
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-11-29 13:05:10 +08:00 |
|
|
|
f808a6ed98
|
feat: 默认布局接口新添加4个字段
|
2025-11-29 10:50:41 +08:00 |
|
|
|
3e14262cf4
|
Merge branch 'feat-cjy-taskBench'
# Conflicts:
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
|
2025-11-28 16:03:59 +08:00 |
|
|
|
88799b6773
|
feat: 最近指派人多返回一个手机号
|
2025-11-28 15:11:37 +08:00 |
|
|
|
79a11cc943
|
feat: 增加隐藏最近指派人功能
|
2025-11-28 13:44:01 +08:00 |
|
|
|
e4cb2f659d
|
Merge branch 'feat-cjy-taskBench'
|
2025-11-27 20:15:35 +08:00 |
|
