Commit Graph

1531 Commits

Author SHA1 Message Date
ea4e66a2a3 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-17 14:08:13 +08:00
4e48fb3742 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-17 14:08:12 +08:00
2e15c23aeb 防止没有数据 2025-12-17 14:08:07 +08:00
jiaji.H
ac85e5abf0 Updata:解决冲突 2025-12-17 13:25:45 +08:00
jiaji.H
50ec661b16 Updata:解决冲突 2025-12-17 13:22:31 +08:00
cjy
62572aa23e Merge branch 'feat-cjy-data' into dev 2025-12-17 13:17:00 +08:00
cjy
e424cef29f fix: 获取详情失败后自动更新为确认失败 2025-12-17 13:16:47 +08:00
jiaji.H
d53eee5f9e Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' into dev 2025-12-17 11:48:37 +08:00
jiaji.H
70ad3b74a1 Updata:修正余量判断 2025-12-17 11:46:55 +08:00
cjy
13fa310b57 Merge branch 'feat-cjy-data' into dev 2025-12-17 11:45:41 +08:00
cjy
c87f27f432 fix 2025-12-17 11:45:09 +08:00
jiaji.H
41ff630b60 Updata:解决冲突 2025-12-17 11:02:58 +08:00
jiaji.H
8c7bf3696f Updata:修正判断 2025-12-17 11:02:00 +08:00
jiaji.H
6817a5bdf3 Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' into dev 2025-12-17 10:06:54 +08:00
jiaji.H
2903e516e1 Updata:更新注释 2025-12-17 10:06:36 +08:00
jiaji.H
0eac0276f9 Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' into dev 2025-12-17 10:01:05 +08:00
jiaji.H
5f50b2c8e2 Updata:增加注释 2025-12-17 10:00:52 +08:00
jiaji.H
345bf66c43 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-17 09:14:09 +08:00
jiaji.H
eda7b21dcc Updata:解决冲突 2025-12-17 09:14:06 +08:00
8f14755364 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-16 20:28:04 +08:00
8a8e983dd2 修改定时发布机制 2025-12-16 20:28:03 +08:00
cjy
77e42deae0 Merge branch 'feat-cjy-data' into dev 2025-12-16 20:26:43 +08:00
cjy
b70814b576 fix:提示语 2025-12-16 20:26:34 +08:00
e06bfdbe6f 修改处理方式 2025-12-16 20:25:56 +08:00
cjy
f954df6bd6 Merge branch 'feat-cjy-data' into dev 2025-12-16 19:45:55 +08:00
cjy
0a035cfeab fix: 增加日志 2025-12-16 19:45:40 +08:00
cjy
e481f61a53 Merge branch 'feat-cjy-data' into dev
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2025-12-16 19:33:48 +08:00
cjy
8fedc385c6 fix:增加日志 2025-12-16 19:32:14 +08:00
399aa08dd0 添加定时消费队列 2025-12-16 19:02:13 +08:00
b0609ebffc 定时处理发布 2025-12-16 18:57:27 +08:00
43404ae283 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-16 17:59:38 +08:00
e1b0c62f28 添加接口 2025-12-16 17:59:32 +08:00
jiaji.H
46b8e1862d Updata:增加启动自动手动确认定时任务 2025-12-16 17:35:29 +08:00
a130bc03c8 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-16 16:39:07 +08:00
8f2c73cb46 阶段 2025-12-16 16:39:03 +08:00
jiaji.H
5a41de85dd Updata:增加手动确认定时任务 2025-12-16 16:14:06 +08:00
1cb27a6589 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-16 16:11:24 +08:00
94f65e9425 Update work.go 2025-12-16 16:11:19 +08:00
34a84bd481 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-16 15:39:30 +08:00
387636b31d Update security.go 2025-12-16 15:39:24 +08:00
5a534936f6 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-16 15:27:58 +08:00
5e1b72f608 Update work.go 2025-12-16 15:27:53 +08:00
a4c48a1dba Merge branch 'feature-userinfo-daiyb' into dev 2025-12-16 15:22:12 +08:00
1fd4feefc9 黄反 2025-12-16 15:22:06 +08:00
c93ae3f602 黄反 2025-12-16 14:58:57 +08:00
77d3f53039 Merge branch 'feature-userinfo-daiyb' into dev 2025-12-16 14:32:13 +08:00
bcbe312ee1 Update work.go 2025-12-16 14:32:08 +08:00
bd9df0a02b Merge branch 'feature-userinfo-daiyb' into dev 2025-12-16 13:49:50 +08:00
499ab0e7b6 Update work.go 2025-12-16 13:48:19 +08:00
626a4a4ed4 列表查询 2025-12-15 19:19:09 +08:00
84c030702e 查询列表 2025-12-15 19:18:07 +08:00
7a12e8b3fa Update init.go 2025-12-15 16:44:18 +08:00
4eb7a09df5 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-15 16:35:50 +08:00
90df2b1a9e 合并发布 2025-12-15 16:35:49 +08:00
9040ebd1ae Merge branch 'main' into feature-userinfo-daiyb 2025-12-15 16:35:04 +08:00
30c1edd959 Merge branch 'feature-newApi-daiyb' into dev 2025-12-15 16:34:47 +08:00
jiaji.H
d958a9e100 Merge branch 'feat-hjj-CastWork#' into dev 2025-12-15 16:13:13 +08:00
jiaji.H
8fea74b9e9 Updata:更新样式 2025-12-15 16:13:03 +08:00
jiaji.H
8fc0336932 Merge branch 'feat-hjj-CastWork#' into dev 2025-12-15 16:09:13 +08:00
jiaji.H
85daee28e7 Updata:修改表格样式 2025-12-15 16:09:00 +08:00
jiaji.H
9f808bbcd4 Merge branch 'feat-hjj-CastWork#' into dev 2025-12-15 16:03:30 +08:00
jiaji.H
e3b4dd4b85 Updata:调整导出样式 2025-12-15 16:03:16 +08:00
jiaji.H
bd1b57ddb2 Merge branch 'feat-hjj-CastWork#' into dev 2025-12-15 15:57:27 +08:00
jiaji.H
7fe45642a7 Updata:修正bug 2025-12-15 15:57:05 +08:00
jiaji.H
3f81b11945 Merge branch 'feat-hjj-CastWork#' into dev 2025-12-15 15:49:43 +08:00
jiaji.H
caef081ab6 Updata:更新导出字段 2025-12-15 15:49:23 +08:00
JNG
3672dc876a Merge branch 'jng' into dev 2025-12-15 15:44:59 +08:00
JNG
46860506bc Update bundleOrder.go 2025-12-15 15:44:51 +08:00
jiaji.H
6223a476b1 Merge branch 'feat-hjj-CastWork#' into dev 2025-12-15 15:42:00 +08:00
jiaji.H
834eb4db1e Updata:增加截止时间打印 2025-12-15 15:41:50 +08:00
731f4bdd91 1 2025-12-15 14:39:48 +08:00
JNG
80da315d7b Merge branch 'jng-1127' into dev 2025-12-15 12:00:30 +08:00
JNG
8e0de49db2 Update pay.go 2025-12-15 12:00:23 +08:00
759e8384dd Merge branch 'feature-newApi-daiyb' 2025-12-15 09:40:53 +08:00
c85fad0d11 同步艺人 2025-12-15 09:40:46 +08:00
fe1a373d6d Update init.go 2025-12-15 09:22:39 +08:00
937527d657 Merge branch 'feature-newApi-daiyb' 2025-12-12 17:34:56 +08:00
64b9753ca1 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-12 16:38:51 +08:00
7cdd27ca03 Merge branch 'feature-newApi-daiyb' into dev 2025-12-12 16:38:28 +08:00
aa30b879ef 过滤发送的平台 2025-12-12 16:38:21 +08:00
jiaji.H
ad00b442df Merge branch 'feat-hjj-filebrowser#Saas3' into dev 2025-12-12 15:35:19 +08:00
jiaji.H
b04677d60d Updata:修改接口类型 2025-12-12 15:32:21 +08:00
jiaji.H
01d54a8f96 Updata:解决冲突 2025-12-12 15:17:22 +08:00
jiaji.H
e28ae14f90 Updata:修改成后台异步 2025-12-12 15:15:05 +08:00
jiaji.H
5bb7dbd802 Merge branch 'feat-hjj-filebrowser#Saas3' into dev 2025-12-12 15:09:45 +08:00
jiaji.H
fd5126b6e9 Updata:更新pb文件 2025-12-12 15:09:30 +08:00
jiaji.H
db36eaca42 Updata:增加黄反接口 2025-12-12 14:40:25 +08:00
jiaji.H
d772faac2f 修改成同步接口 2025-12-12 14:34:01 +08:00
3e29816950 Merge branch 'feature-newApi-daiyb' into dev 2025-12-12 14:10:30 +08:00
9c01669ef2 Update task.go 2025-12-12 14:10:25 +08:00
53b26a3972 Merge branch 'feature-newApi-daiyb' into dev 2025-12-12 13:47:52 +08:00
d495e168fd 刷新权限 2025-12-12 13:47:46 +08:00
jiaji.H
099a9186b3 Updata:补充提交 2025-12-12 13:46:44 +08:00
jiaji.H
9f8885be7e Updata:增加黄反状态修改接口 2025-12-12 13:46:21 +08:00
91c6918e77 Merge branch 'feature-newApi-daiyb' into dev 2025-12-12 13:20:19 +08:00
0639bc973f 修改授权 2025-12-12 13:20:15 +08:00
e7e93ca3b0 修改授权 2025-12-12 11:45:33 +08:00
a9368ce340 修改授权 2025-12-12 11:44:59 +08:00
bx1834938347-prog
c18bd4372f Merge branch 'wwq' 2025-12-12 10:19:50 +08:00
bx1834938347-prog
48916e945a Merge branch 'wwq' into dev 2025-12-12 09:52:06 +08:00