|
|
46b7762471
|
fix:创建竞品报告时,传入订单uuid
|
2026-02-05 20:24:37 +08:00 |
|
|
|
bb326bfe0d
|
fix:更新也增加订单uuid
|
2026-02-05 20:24:00 +08:00 |
|
|
|
0bdf0f9648
|
feat:存入订单uuid
# Conflicts:
# api/cast/cast.pb.go
# api/cast/cast.pb.validate.go
|
2026-02-05 20:22:11 +08:00 |
|
|
|
4c4d139b05
|
fix:更新也增加订单uuid
|
2026-02-05 19:32:00 +08:00 |
|
|
|
6690717e77
|
Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev
|
2026-02-05 18:04:39 +08:00 |
|
|
|
762fdd4b05
|
修改续费逻辑
|
2026-02-05 18:04:39 +08:00 |
|
|
|
6bc617ecc3
|
修改续费逻辑
|
2026-02-05 18:03:18 +08:00 |
|
|
|
d27b85a155
|
feat:存入订单uuid
|
2026-02-05 17:52:24 +08:00 |
|
|
|
4e4ab14d5a
|
Merge branch 'jng-contract-0205' into dev
|
2026-02-05 17:29:05 +08:00 |
|
|
|
41f1a807a9
|
Update signContractV2.go
|
2026-02-05 17:28:52 +08:00 |
|
|
|
81c28c0bd4
|
Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev
|
2026-02-05 17:07:52 +08:00 |
|
|
|
cf2e4067b9
|
脚本更新
|
2026-02-05 17:07:51 +08:00 |
|
|
|
cf709742b2
|
脚本更新
|
2026-02-05 17:06:24 +08:00 |
|
jiaji.H
|
47699dec97
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-05 16:20:06 +08:00 |
|
jiaji.H
|
16d6d4bd29
|
Updata:注释0元生成发票
|
2026-02-05 16:19:51 +08:00 |
|
|
|
38117c3a08
|
Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev
|
2026-02-05 15:50:04 +08:00 |
|
|
|
fee7728da9
|
Merge branch 'feature-four-daiyb' into dev
|
2026-02-05 15:50:00 +08:00 |
|
|
|
e0a5346302
|
完善代码
|
2026-02-05 15:49:55 +08:00 |
|
jiaji.H
|
ee190b4a96
|
Merge branch 'jng' into dev
|
2026-02-05 15:48:54 +08:00 |
|
jiaji.H
|
63e3991f23
|
Updata:更新文件确认
|
2026-02-05 15:48:31 +08:00 |
|
|
|
fbe32fb485
|
套餐已过期
|
2026-02-05 15:44:55 +08:00 |
|
|
|
433ec99628
|
套餐已过期
|
2026-02-05 15:44:19 +08:00 |
|
|
|
9ba37adb6b
|
Merge branch 'feature-four-daiyb' into dev
|
2026-02-05 14:39:30 +08:00 |
|
|
|
164b683b7d
|
Update task.go
|
2026-02-05 14:39:22 +08:00 |
|
|
|
b1bde71f34
|
Update task.go
|
2026-02-05 14:38:45 +08:00 |
|
|
|
2aa0a73041
|
fix:暂时注释
|
2026-02-05 13:15:02 +08:00 |
|
|
|
084df09c9b
|
Merge branch 'feat-cjy-changeOperator' into dev
# Conflicts:
# api/cast/cast.pb.go
# api/cast/cast.pb.validate.go
|
2026-02-05 13:10:00 +08:00 |
|
|
|
1d2ba64a22
|
fix:视频脚本为任务4
|
2026-02-05 11:36:33 +08:00 |
|
|
|
be1b0d24ec
|
fix:视频脚本为任务4
|
2026-02-05 11:36:08 +08:00 |
|
|
|
51f0d2b687
|
fix:视频脚本为任务4
|
2026-02-05 11:35:50 +08:00 |
|
|
|
748ceb5d63
|
feat: 增加审批通过时间
|
2026-02-05 11:28:01 +08:00 |
|
|
|
d92d4199c7
|
fix:修改刷新定时任务的频率,并修改pageSize数量
|
2026-02-05 09:57:14 +08:00 |
|
|
|
c82f137ac1
|
fix:调用列表不再刷新审批更新状态
|
2026-02-05 09:56:20 +08:00 |
|
|
|
15338ca7c8
|
fix:更新通过审批的操作人为业务部门
|
2026-02-05 09:52:32 +08:00 |
|
|
|
5d27d502c8
|
取消授权写入excel
|
2026-02-04 19:15:36 +08:00 |
|
|
|
f4c826936b
|
解绑取消授权记录
|
2026-02-04 19:02:42 +08:00 |
|
|
|
f59b434dc7
|
同步bundle的proto
|
2026-02-04 17:39:00 +08:00 |
|
jiaji.H
|
529e5e3f3c
|
Updata:更新log
|
2026-02-04 16:48:07 +08:00 |
|
jiaji.H
|
20af43c9e2
|
Updata:增加调试log
|
2026-02-04 16:47:15 +08:00 |
|
jiaji.H
|
41880fd840
|
Updata:解决冲突
|
2026-02-04 16:41:31 +08:00 |
|
jiaji.H
|
e6af927159
|
Updata:更新判别是否为新套餐还是续费套餐
|
2026-02-04 16:39:36 +08:00 |
|
|
|
3940e5f9eb
|
Merge branch 'feature-four-daiyb' into dev
|
2026-02-04 16:09:14 +08:00 |
|
|
|
39dc62b032
|
套餐续费和新购
|
2026-02-04 16:09:08 +08:00 |
|
jiaji.H
|
5ded15fbb0
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-04 14:11:29 +08:00 |
|
jiaji.H
|
c5e36a2ae9
|
Updata:更新字段
|
2026-02-04 14:11:21 +08:00 |
|
jiaji.H
|
0a7e169a7e
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-04 14:09:28 +08:00 |
|
jiaji.H
|
94a1c30acd
|
Updata:更新时间获取
|
2026-02-04 14:09:18 +08:00 |
|
jiaji.H
|
566773b0f6
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-04 14:00:07 +08:00 |
|
jiaji.H
|
e1271f7caf
|
Updata:更新时间获取
|
2026-02-04 13:59:57 +08:00 |
|
|
|
e767e47277
|
Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev
|
2026-02-04 13:48:57 +08:00 |
|
|
|
7cca30c2a5
|
Merge branch 'fix-operator-daiyb' into dev
|
2026-02-04 13:48:53 +08:00 |
|
|
|
d3ae7e0b85
|
修改默认值
|
2026-02-04 13:48:46 +08:00 |
|
jiaji.H
|
38c1667614
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-04 13:45:09 +08:00 |
|
jiaji.H
|
bdecb8a05f
|
Updata:更新数据
|
2026-02-04 13:45:01 +08:00 |
|
jiaji.H
|
531fddc629
|
Updata:解决冲突
|
2026-02-04 13:23:24 +08:00 |
|
jiaji.H
|
4a2263fba9
|
Updata:更新发票订单信息查询
|
2026-02-04 13:21:24 +08:00 |
|
jiaji.H
|
13ea22fae8
|
Updata:修改获取时间逻辑
|
2026-02-04 13:11:33 +08:00 |
|
|
|
f0253f9805
|
Merge branch 'feat-zjy-fixbug-033' into dev
|
2026-02-04 13:09:13 +08:00 |
|
|
|
48aa714706
|
fix: 调整创建订单的uuid
|
2026-02-04 13:08:30 +08:00 |
|
|
|
c85fbb0b81
|
fix: 调整创建订单的uuid
|
2026-02-04 12:24:23 +08:00 |
|
|
|
bf09640ff0
|
Merge branch 'feat-zjy-fixbug-033' into dev
# Conflicts:
# api/bundle/bundle.pb.go
# api/bundle/bundle.validator.pb.go
# api/bundle/bundle_triple.pb.go
# pkg/service/bundle/pay.go
|
2026-02-04 12:20:18 +08:00 |
|
|
|
54b15344e0
|
fix: 调整创建订单的uuid
|
2026-02-04 12:13:27 +08:00 |
|
jiaji.H
|
3e454b4348
|
Updata:增加log
|
2026-02-04 11:46:32 +08:00 |
|
|
|
1344e1da8b
|
fix: 222
|
2026-02-04 11:36:32 +08:00 |
|
jiaji.H
|
6f86e07650
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-04 10:43:46 +08:00 |
|
jiaji.H
|
b4e95bc134
|
Updata:增加时间格式化接口
|
2026-02-04 10:43:36 +08:00 |
|
jiaji.H
|
62c8cb0fa1
|
Updata:解决冲突
|
2026-02-04 10:27:09 +08:00 |
|
jiaji.H
|
b047ed5056
|
Updata:增加log
|
2026-02-04 10:25:33 +08:00 |
|
jiaji.H
|
717ae05cc8
|
Updata:替换获取发票编号接口
|
2026-02-04 10:23:33 +08:00 |
|
|
|
573ad1b147
|
fix: antomReq.OutTradeNo = uuidV4.String()
|
2026-02-04 10:21:41 +08:00 |
|
|
|
a947556202
|
fix: antomReq.OutTradeNo = uuidV4.String()
|
2026-02-04 10:11:20 +08:00 |
|
|
|
5a89ad139f
|
Merge branch 'feat-cjy-customerContract'
# Conflicts:
# api/bundle/bundle.pb.go
# api/bundle/bundle.validator.pb.go
# api/bundle/bundle_triple.pb.go
|
2026-02-04 09:42:19 +08:00 |
|
|
|
5a814ab12f
|
DM取消授权
|
2026-02-04 09:41:39 +08:00 |
|
|
|
8197ac4b57
|
Merge branch 'jng' into dev
|
2026-02-03 19:41:57 +08:00 |
|
|
|
a0ad992ab1
|
Update bundleOrder.go
|
2026-02-03 19:41:43 +08:00 |
|
jiaji.H
|
5eb27a0b49
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 17:33:35 +08:00 |
|
jiaji.H
|
25905062f6
|
Updata:生成发票时间修改
|
2026-02-03 17:33:14 +08:00 |
|
|
|
62fa35b029
|
解决冲突
|
2026-02-03 16:49:17 +08:00 |
|
|
|
0802c372b0
|
修改
|
2026-02-03 16:46:57 +08:00 |
|
jiaji.H
|
b0c725a68b
|
Merge branch 'feat-hjj-ExportBat'
|
2026-02-03 16:26:49 +08:00 |
|
|
|
bb9c22e1aa
|
Merge branch 'feature-four-daiyb' into jng
|
2026-02-03 16:24:16 +08:00 |
|
jiaji.H
|
368078c543
|
Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev
|
2026-02-03 16:21:35 +08:00 |
|
jiaji.H
|
982558afe3
|
Updata:更新判断
|
2026-02-03 16:21:30 +08:00 |
|
|
|
103fe91e8f
|
Merge branch 'feature-four-daiyb' into dev
|
2026-02-03 16:21:25 +08:00 |
|
|
|
bbb09a08b2
|
修改接口
|
2026-02-03 16:21:13 +08:00 |
|
jiaji.H
|
e9d67c5cdc
|
Updata:更新判断
|
2026-02-03 16:20:48 +08:00 |
|
jiaji.H
|
a9201e794c
|
Updata:解决冲突
|
2026-02-03 16:19:27 +08:00 |
|
jiaji.H
|
0cb451338c
|
Updata:解决冲突
|
2026-02-03 16:14:57 +08:00 |
|
jiaji.H
|
6110dce131
|
Updata:解决冲突
|
2026-02-03 16:06:54 +08:00 |
|
jiaji.H
|
267b0d6ab8
|
Updata:更新字段格式
|
2026-02-03 16:06:11 +08:00 |
|
jiaji.H
|
34810300da
|
Updata:更新字段格式
|
2026-02-03 16:04:53 +08:00 |
|
|
|
7e77b6d585
|
发布来源
|
2026-02-03 15:29:36 +08:00 |
|
jiaji.H
|
9704208f9d
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 15:09:02 +08:00 |
|
jiaji.H
|
b385b83824
|
Updata:增加发票地址打印换行
|
2026-02-03 15:08:52 +08:00 |
|
jiaji.H
|
63e57f1140
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 14:50:46 +08:00 |
|
jiaji.H
|
59f45258eb
|
Updata:增加间隔
|
2026-02-03 14:50:39 +08:00 |
|
jiaji.H
|
802510ed45
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 14:24:11 +08:00 |
|
jiaji.H
|
81346d611a
|
Updata:更新发票
|
2026-02-03 14:24:00 +08:00 |
|
jiaji.H
|
cba570d832
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 14:15:35 +08:00 |
|
jiaji.H
|
6031afe227
|
Updata:更新金额类型
|
2026-02-03 14:15:27 +08:00 |
|
jiaji.H
|
d56ed7577b
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 13:42:02 +08:00 |
|
jiaji.H
|
c16c41f65c
|
Updata:更新申请时间
|
2026-02-03 13:41:51 +08:00 |
|
jiaji.H
|
48a4539f4b
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 13:29:56 +08:00 |
|
jiaji.H
|
1431646900
|
Updata:更新发票导出
|
2026-02-03 13:29:50 +08:00 |
|
jiaji.H
|
638ff85367
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 11:49:40 +08:00 |
|
jiaji.H
|
350259c208
|
Updata:更新发票模板
|
2026-02-03 11:49:31 +08:00 |
|
jiaji.H
|
652e23e1e9
|
Merge branch 'feat-hjj-ExportBat'
|
2026-02-03 11:20:07 +08:00 |
|
jiaji.H
|
33d9193f1d
|
Updata:更新精度处理
|
2026-02-03 11:19:59 +08:00 |
|
jiaji.H
|
3d40d77080
|
Merge branch 'feat-hjj-ExportBat'
|
2026-02-03 10:50:21 +08:00 |
|
jiaji.H
|
24c73d39a5
|
Updata:更新数据导出精度
|
2026-02-03 10:50:12 +08:00 |
|
|
|
1096dde762
|
Merge branch 'feature-four-daiyb' into jng
|
2026-02-03 10:23:22 +08:00 |
|
|
|
71420b3c1c
|
11
|
2026-02-03 10:19:33 +08:00 |
|
|
|
afc0007984
|
Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev
|
2026-02-03 09:45:51 +08:00 |
|
|
|
f39ca2179d
|
Merge branch 'feature-four-daiyb' into dev
|
2026-02-03 09:45:50 +08:00 |
|
|
|
544a8be9dc
|
解绑账号
|
2026-02-03 09:45:44 +08:00 |
|
jiaji.H
|
e3075e48b9
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 09:31:49 +08:00 |
|
jiaji.H
|
a1d75feb94
|
Updata:更新数据写入
|
2026-02-03 09:31:39 +08:00 |
|
jiaji.H
|
e4c21ef020
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-02 20:26:18 +08:00 |
|
jiaji.H
|
8941f59432
|
Updata:增加发票数据导出
|
2026-02-02 20:26:10 +08:00 |
|
jiaji.H
|
3d7b70840a
|
Updata:解决冲突
|
2026-02-02 20:03:11 +08:00 |
|
jiaji.H
|
1a069a7136
|
Updata:更新pb文件
|
2026-02-02 20:01:50 +08:00 |
|
jiaji.H
|
1b06517403
|
Updata:更新pb文件
|
2026-02-02 19:47:46 +08:00 |
|
jiaji.H
|
7df053aa39
|
Updata:增加注释
|
2026-02-02 19:47:20 +08:00 |
|
jiaji.H
|
3cd8deb84b
|
Updata:自动创建电子发票
|
2026-02-02 19:43:42 +08:00 |
|
jiaji.H
|
b47b872ab4
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-02 19:17:11 +08:00 |
|
jiaji.H
|
fa67b49c53
|
Updata:更新上传逻辑
|
2026-02-02 19:17:03 +08:00 |
|
jiaji.H
|
faf4a85e2e
|
Updata:修改上传bos方法
|
2026-02-02 19:15:15 +08:00 |
|
jiaji.H
|
1ead1952a1
|
Updata:解决冲突
|
2026-02-02 18:14:36 +08:00 |
|
jiaji.H
|
3c0ddfe06b
|
Updata:更新发票生成
|
2026-02-02 18:14:00 +08:00 |
|
jiaji.H
|
ac776576f2
|
Updata:增加log
|
2026-02-02 17:53:51 +08:00 |
|
jiaji.H
|
3a156b08f0
|
增加测试代码
|
2026-02-02 17:39:01 +08:00 |
|
jiaji.H
|
bcbddbec6f
|
Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev
|
2026-02-02 17:11:50 +08:00 |
|
jiaji.H
|
a8e79d0877
|
Updata:去除返回
|
2026-02-02 17:11:44 +08:00 |
|
|
|
f4f75a06ca
|
Merge branch 'feature-four-daiyb'
|
2026-02-02 16:50:59 +08:00 |
|
|
|
579fcb3667
|
Merge branch 'feature-four-daiyb' into dev
|
2026-02-02 16:50:51 +08:00 |
|
|
|
076d4d3f80
|
Update test.go
|
2026-02-02 16:50:46 +08:00 |
|
|
|
c9543cfad2
|
Merge branch 'feature-four-daiyb'
|
2026-02-02 16:46:35 +08:00 |
|
|
|
e5dedcaf91
|
Merge branch 'feature-four-daiyb' into dev
|
2026-02-02 16:46:26 +08:00 |
|
|
|
3313cb56b4
|
修改每个月1号等待一下1点后执行
|
2026-02-02 16:46:20 +08:00 |
|
jiaji.H
|
dbb8cd4615
|
Merge branch 'main' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee
|
2026-02-02 16:39:54 +08:00 |
|
jiaji.H
|
e85de27321
|
Updata:更新pb文件
|
2026-02-02 16:39:49 +08:00 |
|
|
|
b62d412022
|
Merge branch 'main' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee
|
2026-02-02 16:13:42 +08:00 |
|
|
|
7373026f48
|
Merge branch 'feature-four-daiyb'
|
2026-02-02 16:13:01 +08:00 |
|
jiaji.H
|
c9e7850b8a
|
Merge branch 'feat-hjj-ExportBat'
|
2026-02-02 16:04:11 +08:00 |
|
jiaji.H
|
29948203d6
|
Updata:更新导出模板
|
2026-02-02 16:04:01 +08:00 |
|
jiaji.H
|
101dc38ed8
|
Updata:解决冲突
|
2026-02-02 15:48:09 +08:00 |
|
jiaji.H
|
7dee667a97
|
Updata:增加导出数据验收类型
|
2026-02-02 15:42:16 +08:00 |
|
jiaji.H
|
a5dcdf2a75
|
Updata:更新pb文件
|
2026-02-02 15:29:00 +08:00 |
|
jiaji.H
|
275b94d555
|
Updata:更新截取长度
|
2026-02-02 15:26:53 +08:00 |
|
jiaji.H
|
bc1ff822eb
|
Updata:解决冲突
|
2026-02-02 13:43:20 +08:00 |
|
jiaji.H
|
4e97d3903b
|
Updata:更新字段类型
|
2026-02-02 13:41:49 +08:00 |
|
jiaji.H
|
7391e4c845
|
Updata:解决冲突
|
2026-02-02 11:23:23 +08:00 |
|
jiaji.H
|
5a8a75b8ed
|
Updata:更新发票管理相关接口
|
2026-02-02 11:03:07 +08:00 |
|
|
|
5e762104d9
|
fix:移除测试环境不必要的导入
|
2026-02-02 10:26:24 +08:00 |
|
bx1834938347-prog
|
9f3d4fab99
|
Merge branch 'wwq' into dev
|
2026-02-02 09:41:06 +08:00 |
|
bx1834938347-prog
|
46b9225298
|
feat:新增补发定时任务
|
2026-02-02 09:40:55 +08:00 |
|
|
|
28ea5ec412
|
fix:套餐过期后,只显示套餐过期的上一个套餐期间的竞品报告和数据分析
|
2026-02-02 09:35:22 +08:00 |
|
|
|
c87c1be186
|
Update work.go
|
2026-01-30 20:23:37 +08:00 |
|
|
|
8c18af01a8
|
Update work.go
|
2026-01-30 20:19:31 +08:00 |
|
|
|
e57dd03269
|
Update work.go
|
2026-01-30 19:53:05 +08:00 |
|
|
|
6f1277ec9b
|
Update work.go
|
2026-01-30 19:49:44 +08:00 |
|
|
|
f6c5f53002
|
merge main
|
2026-01-30 19:44:34 +08:00 |
|
|
|
dee2b9d50c
|
Update work.go
|
2026-01-30 19:40:52 +08:00 |
|
|
|
248d8f50ef
|
fix:修改状态映射
|
2026-01-30 18:31:28 +08:00 |
|
|
|
def4c797f2
|
fix:修改状态映射
|
2026-01-30 18:31:05 +08:00 |
|
|
|
ba19e65e7f
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-30 18:21:19 +08:00 |
|
|
|
8e7a3643d2
|
Merge branch 'feat-cjy-report'
|
2026-01-30 18:20:52 +08:00 |
|
|
|
61aa8af162
|
Revert "fix:如果新买一个套餐,原有套餐的直接通过,不需要消耗额度"
This reverts commit 7564af8220.
|
2026-01-30 18:20:32 +08:00 |
|
|
|
df8fbfbc43
|
fix:修复批量导入的时候,始终固定报告名
|
2026-01-30 17:31:00 +08:00 |
|
|
|
a2703f907e
|
fix:修复批量导入的时候,始终固定报告名
|
2026-01-30 17:29:10 +08:00 |
|
|
|
6619c99be7
|
fix:修复批量导入的时候,始终固定报告名
|
2026-01-30 17:28:24 +08:00 |
|
jiaji.H
|
60a01e996a
|
Updata:更新发票接口
|
2026-01-30 16:56:51 +08:00 |
|
|
|
f7ba1e75ca
|
Merge branch 'jng' into dev
|
2026-01-30 16:20:01 +08:00 |
|
|
|
80941aacfb
|
Update bundleOrder.go
|
2026-01-30 16:19:53 +08:00 |
|
|
|
971c3a8ea4
|
Merge branch 'jng' into dev
|
2026-01-30 16:15:02 +08:00 |
|
|
|
55267abc89
|
Update bundleOrder.go
|
2026-01-30 16:14:56 +08:00 |
|
|
|
08e3bcd658
|
fix: 清除空格
|
2026-01-30 15:56:42 +08:00 |
|
|
|
2de4164875
|
fix: 清除空格
|
2026-01-30 15:56:26 +08:00 |
|
|
|
ebd1b52326
|
11
|
2026-01-30 15:44:53 +08:00 |
|
|
|
2eb82a21cb
|
修改
|
2026-01-30 15:44:21 +08:00 |
|
|
|
84ba139fc8
|
feat: 增加推荐人列表接口
# Conflicts:
# api/bundle/bundle.pb.go
|
2026-01-30 15:44:04 +08:00 |
|
|
|
2e6c77cf88
|
添加购买类型
|
2026-01-30 15:43:27 +08:00 |
|
|
|
e57c664ec0
|
feat: 增加推荐人列表接口
|
2026-01-30 15:42:25 +08:00 |
|
jiaji.H
|
ab6349d438
|
Updata:解决冲突
|
2026-01-30 15:20:54 +08:00 |
|
|
|
a5ffa3e8b5
|
Merge branch 'jng'
|
2026-01-30 14:07:46 +08:00 |
|
|
|
8eb2476f95
|
11
|
2026-01-30 14:00:22 +08:00 |
|
|
|
e59c4f5487
|
11
|
2026-01-30 13:58:21 +08:00 |
|
|
|
df0df7b652
|
Merge branch 'main' into jng
|
2026-01-30 13:51:10 +08:00 |
|
jiaji.H
|
e4e2e303ea
|
美化文件名称
|
2026-01-30 13:43:40 +08:00 |
|
jiaji.H
|
973c95c76d
|
Updata:文件名增加时间戳
|
2026-01-30 13:40:15 +08:00 |
|
jiaji.H
|
b05a300aa9
|
Updata:更新接口
|
2026-01-30 13:22:43 +08:00 |
|
|
|
74bc61a51b
|
feat: 增加合同管理接口和路由
|
2026-01-30 13:19:38 +08:00 |
|
jiaji.H
|
0e79282724
|
Updata:修正路由
|
2026-01-30 13:02:10 +08:00 |
|
jiaji.H
|
bc27434bed
|
Updaya:增加导出接口
|
2026-01-30 12:42:47 +08:00 |
|
jiaji.H
|
c0d8c07a90
|
Updata:增加临时数据信息导出
|
2026-01-30 12:35:19 +08:00 |
|
|
|
254d85ced3
|
Merge branch 'feat-cjy-report'
# Conflicts:
# api/cast/cast.pb.go
# api/cast/cast.pb.validate.go
# api/cast/cast_triple.pb.go
# pkg/service/cast/work.go
|
2026-01-30 12:01:23 +08:00 |
|
jiaji.H
|
8371c5944a
|
Updata:增加发票相关接口
|
2026-01-30 11:39:46 +08:00 |
|
|
|
83285387e3
|
feat: 增加合同管理接口和路由
|
2026-01-30 10:05:56 +08:00 |
|
|
|
7c45999a40
|
Merge branch 'feature-four-daiyb' into dev
|
2026-01-29 11:42:23 +08:00 |
|
|
|
26658aaa5e
|
修改名称
|
2026-01-29 11:42:14 +08:00 |
|
|
|
4e69ab9731
|
Merge branch 'feature-four-daiyb' into dev
|
2026-01-29 11:16:38 +08:00 |
|
|
|
a67adf0013
|
更新账号返回状态
|
2026-01-29 11:16:27 +08:00 |
|
|
|
c6cf13465c
|
Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev
|
2026-01-27 14:36:26 +08:00 |
|
|
|
e4c88feaef
|
Merge branch 'feature-four-daiyb' into dev
|
2026-01-27 14:36:25 +08:00 |
|
|
|
c8e5ab9873
|
Update test.go
|
2026-01-27 13:37:10 +08:00 |
|
|
|
12870fbf94
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-27 13:24:43 +08:00 |
|
|
|
7564af8220
|
fix:如果新买一个套餐,原有套餐的直接通过,不需要消耗额度
|
2026-01-27 13:24:35 +08:00 |
|
jiaji.H
|
abcd4609c7
|
Updata:解决冲突
|
2026-01-26 16:34:11 +08:00 |
|
|
|
451fe4b2e2
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-26 15:59:06 +08:00 |
|
|
|
4ce735d4de
|
fix: 买套餐之后,旧套餐期间的数据分析和竞品报告不让看
|
2026-01-26 15:58:58 +08:00 |
|
|
|
889acc4e78
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-26 15:27:42 +08:00 |
|
|
|
c6f4385991
|
fix: 修改报告名
|
2026-01-26 15:27:32 +08:00 |
|
|
|
82fd06139a
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-26 15:01:09 +08:00 |
|
|
|
c0ea800511
|
fix: 修复套餐过期导致的错误
|
2026-01-26 15:01:01 +08:00 |
|
|
|
5a8e155807
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-26 11:08:09 +08:00 |
|
|
|
6c7e27ce78
|
fix: 修复检查余额的逻辑
|
2026-01-26 11:08:02 +08:00 |
|
|
|
294f3b8d95
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-26 10:44:51 +08:00 |
|
|
|
7ba69a3afd
|
fix: 修改批量导入竞品报告的模板
1.批量导入竞品报告的时候自动生成pdf
2. 增加生成pdf的检查
|
2026-01-26 10:44:43 +08:00 |
|
|
|
ea7134053c
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-26 10:03:01 +08:00 |
|
|
|
e7f90a304b
|
fix: 移除检查
|
2026-01-26 10:02:51 +08:00 |
|
|
|
bd5eb45371
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-26 09:47:30 +08:00 |
|
|
|
d20a124e14
|
fix: 修复逻辑
|
2026-01-26 09:47:21 +08:00 |
|
|
|
cebf10a3e6
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-26 09:25:01 +08:00 |
|
|
|
cccee7f86e
|
fix:修复逻辑
|
2026-01-26 09:24:35 +08:00 |
|
|
|
1277e0da8d
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-23 17:00:12 +08:00 |
|
|
|
adf3b5ee89
|
fix: 竞品报告需要扣减余额,以及修改错误提示语
|
2026-01-23 16:59:44 +08:00 |
|
|
|
5df90b156e
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-23 16:30:15 +08:00 |
|
|
|
ffdc047d15
|
fix: h5艺人确认增加校验
|
2026-01-23 16:30:06 +08:00 |
|
|
|
acaa112c5b
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-23 14:43:47 +08:00 |
|
|
|
89bf59d878
|
fix: 修改竞品报告的prompts
|
2026-01-23 14:43:39 +08:00 |
|
|
|
5179c9e597
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-23 14:34:40 +08:00 |
|
|
|
6845ea1736
|
fix: 修复逻辑错误
|
2026-01-23 14:34:30 +08:00 |
|
|
|
861bafc837
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-23 14:30:44 +08:00 |
|
|
|
351709d08e
|
fix: 修复页面空间不足时,图片展示不完全的问题
|
2026-01-23 14:30:19 +08:00 |
|
|
|
b9b2ccbe0b
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-23 11:14:30 +08:00 |
|
|
|
11c8d63789
|
fix:修改生成pdf的文件名
|
2026-01-23 11:14:14 +08:00 |
|
|
|
c96bb04e55
|
Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev
|
2026-01-23 10:49:52 +08:00 |
|
|
|
c273a2650c
|
Merge branch 'feature-four-daiyb' into dev
|
2026-01-23 10:49:24 +08:00 |
|
|
|
193f6cd226
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-23 10:20:42 +08:00 |
|
|
|
c8397bcfe9
|
fix: 修改生成竞品报告的prompts
|
2026-01-23 10:18:44 +08:00 |
|
|
|
136af31283
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-23 09:29:42 +08:00 |
|
|
|
91f7b54581
|
fix: 修改一下promps,不让ai输出markdown格式
|
2026-01-23 09:28:22 +08:00 |
|
|
|
ecfa719341
|
Update test.go
|
2026-01-22 16:35:09 +08:00 |
|
|
|
7227f1b05e
|
Merge branch 'jng' into dev
|
2026-01-22 15:57:36 +08:00 |
|
|
|
bd0722bd86
|
修改
|
2026-01-22 15:57:28 +08:00 |
|
|
|
684e324238
|
Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev
|
2026-01-22 09:55:02 +08:00 |
|
|
|
c29f26e582
|
Merge branch 'feature-four-daiyb' into dev
|
2026-01-22 09:55:01 +08:00 |
|
|
|
8a9bb7d179
|
修改自媒体账号获取方式
|
2026-01-22 09:54:53 +08:00 |
|
|
|
9f9634e38e
|
发送日志数据
|
2026-01-22 09:27:39 +08:00 |
|
|
|
3806c57e90
|
Merge branch 'feat-cjy-report' into dev
|
2026-01-21 16:09:53 +08:00 |
|