Commit Graph

1926 Commits

Author SHA1 Message Date
fc0484370a Merge branch 'feature-userinfo-daiyb' into dev 2025-12-17 17:05:09 +08:00
6137604749 Merge branch 'main' into feature-userinfo-daiyb 2025-12-17 17:02:14 +08:00
7d14505bf4 合并冲突 2025-12-17 17:01:53 +08:00
a7ac8beb3a Merge branch 'main' into feature-userinfo-daiyb 2025-12-17 17:00:18 +08:00
jiaji.H
c2b4114bd5 Updata:解决冲突 2025-12-17 16:24:53 +08:00
jiaji.H
9477939a5a Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' 2025-12-17 16:21:16 +08:00
jiaji.H
ccf51138e3 Updata:更新逻辑 2025-12-17 16:21:03 +08:00
jiaji.H
a31daaf8c8 Updata:解决冲突 2025-12-17 16:18:57 +08:00
jiaji.H
d7639d46a6 Updata:更新pb文件 2025-12-17 16:18:11 +08:00
3c5132777c Update work.go 2025-12-17 16:14:49 +08:00
9731c02a63 Merge branch 'main' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee 2025-12-17 15:12:55 +08:00
e2abc91367 Merge branch 'feature-upload-daiyb' into dev 2025-12-17 14:45:26 +08:00
188d5c27b2 修改文件上传as 2025-12-17 14:45:15 +08:00
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
55df08b314 完善微服务 2025-12-17 11:20:08 +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
4357edb29f Merge branch 'feat-cjy-data' into dev
# Conflicts:
#	api/cast/cast.pb.go
2025-12-16 19:40:04 +08:00
cjy
e1fa4468f2 fix: 更新pb 2025-12-16 19:39:21 +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
f234a97213 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2025-12-16 16:39:08 +08:00