Commit Graph

935 Commits

Author SHA1 Message Date
97d05aad91 限制黄反长度 2026-02-11 16:11:43 +08:00
cjy
0a081c9610 update: pb文件 2026-02-11 14:04:00 +08:00
cjy
6d84ed7235 fix:通过subnum获取艺人信息 2026-02-10 16:46:47 +08:00
jiaji.H
9d93484788 Updata:解决冲突 2026-02-10 15:37:23 +08:00
jiaji.H
e102a92992 Merge branch 'feat-hjj-filebrowser#Saas3' 2026-02-10 13:14:21 +08:00
jiaji.H
cf1ee05640 Updata:解决冲突 2026-02-10 11:35:21 +08:00
jiaji.H
ac9cb23617 Updata:增加发票下载生成行url逻辑 2026-02-10 11:32:34 +08:00
jiaji.H
00be8ca5db Updata:更新发票下载接口 2026-02-10 11:12:06 +08:00
cjy
5b7dd0b9cf fix:更新pb
# Conflicts:
#	api/bundle/bundle.pb.go
#	api/bundle/bundle_triple.pb.go
2026-02-09 15:06:38 +08:00
cjy
02aa3fa3d9 update:更新pb
# Conflicts:
#	api/cast/cast.pb.go

# Conflicts:
#	api/bundle/bundle.validator.pb.go
2026-02-09 14:58:55 +08:00
74c66abad7 修改审批 2026-02-09 14:53:50 +08:00
27137508f7 Merge branch 'feature-scriptApproval-daiyb' into dev 2026-02-09 14:24:32 +08:00
372af8d0e5 审批时间 2026-02-09 14:23:50 +08:00
cjy
7ee7bd7370 update:pb文件 2026-02-09 12:47:15 +08:00
cjy
c941a46cee fix:续费的话,查询续费开始到现在套餐的时间所有数据
# Conflicts:
#	api/bundle/bundle.pb.go
#	api/cast/cast.pb.go
#	pkg/service/cast/analysis.go
#	pkg/service/cast/report.go
2026-02-09 12:36:51 +08:00
cjy
31a08879b6 fix:如果套餐为续费套餐直接失败
# Conflicts:
#	api/cast/cast.pb.go
2026-02-09 11:58:14 +08:00
cjy
063a7991ba Merge branch 'fix-cjy-baseOnjng'
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2026-02-09 11:53:30 +08:00
cjy
59ece0cb7f Merge branch 'feat-cjy-changeOperator'
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
#	pkg/cron/task.go
2026-02-09 11:52:07 +08:00
jiaji.H
4530e68c11 Updata:解决冲突 2026-02-09 11:46:18 +08:00
jiaji.H
f751d84943 Updata:解决冲突 2026-02-09 11:33:38 +08:00
JNG
0a1678da58 11 2026-02-09 11:33:14 +08:00
JNG
e1a75ee420 解决冲突 2026-02-09 11:31:22 +08:00
195ac2a769 fiee5️⃣期需求
账号过期解绑
2026-02-09 11:30:22 +08:00
56a0882f03 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-09 11:12:03 +08:00
7dc1dca799 修改审批时间 2026-02-09 11:11:59 +08:00
28d7fea3c7 修改审批时间 2026-02-09 11:11:06 +08:00
jiaji.H
85a6d2eb3e Merge branch 'feat-hjj-filebrowser#Saas3' into dev 2026-02-09 11:00:24 +08:00
jiaji.H
99b2e125d6 Updata:更新pb文件 2026-02-09 10:59:54 +08:00
bx1834938347-prog
8eb22deb18 Merge branch 'wwq' 2026-02-09 09:41:51 +08:00
cjy
0142be0dc6 fix:续费的话,查询续费开始到现在套餐的时间所有数据 2026-02-06 17:00:38 +08:00
cjy
da49041b5b update:更新pb 2026-02-05 20:28:47 +08:00
cjy
bb326bfe0d fix:更新也增加订单uuid 2026-02-05 20:24:00 +08:00
cjy
0bdf0f9648 feat:存入订单uuid
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2026-02-05 20:22:11 +08:00
cjy
4c4d139b05 fix:更新也增加订单uuid 2026-02-05 19:32:00 +08:00
f68e099d6e Merge branch 'feature-four-daiyb' into dev 2026-02-05 18:52:13 +08:00
1186336dd3 1 2026-02-05 18:52:02 +08:00
ca4a5772d2 Merge branch 'feature-four-daiyb' into dev 2026-02-05 18:07:59 +08:00
4b9bfc15a0 1 2026-02-05 18:07:54 +08:00
762fdd4b05 修改续费逻辑 2026-02-05 18:04:39 +08:00
6bc617ecc3 修改续费逻辑 2026-02-05 18:03:18 +08:00
cjy
d27b85a155 feat:存入订单uuid 2026-02-05 17:52:24 +08:00
cf2e4067b9 脚本更新 2026-02-05 17:07:51 +08:00
cf709742b2 脚本更新 2026-02-05 17:06:24 +08:00
9fb4b01590 批量查询 2026-02-05 16:23:44 +08:00
d0d5cd50a2 修改绑定订单 2026-02-05 15:38:48 +08:00
4c8789ed38 修改绑定订单 2026-02-05 15:38:12 +08:00
jiaji.H
bfd2dcd3cd Merge branch 'feat-hjj-OfficialManage#A161' 2026-02-05 14:56:53 +08:00
cjy
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
cjy
35bc4a04c3 feat:更新pb文件 2026-02-05 11:25:58 +08:00
f59b434dc7 同步bundle的proto 2026-02-04 17:39:00 +08:00