Commit Graph

800 Commits

Author SHA1 Message Date
9050f98e67 修改套餐过期逻辑 2026-01-20 16:27:15 +08:00
abecc03b96 修改套餐过期 2026-01-20 16:26:05 +08:00
cjy
7eba8c6293 Merge branch 'feat-cjy-tag'
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
#	api/cast/cast_triple.pb.go
2026-01-20 09:37:22 +08:00
cjy
a7b2de6ed9 Merge branch 'feat-cjy-report' into dev
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2026-01-19 11:49:26 +08:00
cjy
4f9a38693d feat: 更新pb文件 2026-01-19 11:48:46 +08:00
050a82d732 Merge branch 'feature-userinfo-daiyb' 2026-01-16 17:27:37 +08:00
bd2f776a7f Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-01-16 17:20:45 +08:00
557e16a706 Merge branch 'feature-userinfo-daiyb' into dev 2026-01-16 17:20:44 +08:00
354d71b53e 修改图片分辨率 2026-01-16 17:20:37 +08:00
JNG
564007d45d 解决冲突 2026-01-16 14:57:41 +08:00
JNG
302a5a40d0 添加注销功能 2026-01-16 14:55:54 +08:00
60c8855993 批量导出Excel表格以及压缩图片 2026-01-16 10:45:27 +08:00
JNG
dc677b4344 Merge branch 'jng-supplier-0105' 2026-01-16 10:05:11 +08:00
bx1834938347-prog
d0ea217581 Merge branch 'main' into wwq 2026-01-16 09:45:19 +08:00
c5b86b862f Merge branch 'feature-userinfo-daiyb' into dev 2026-01-15 17:30:35 +08:00
f7dbcfea06 任务记录 2026-01-15 17:12:39 +08:00
817ded18c7 Merge branch 'feature-userinfo-daiyb' into dev 2026-01-15 16:52:57 +08:00
e6459e14a1 修改任务记录 2026-01-15 16:52:51 +08:00
JNG
5f2089fa53 Merge branch 'jng-supplier-0105' into dev 2026-01-15 16:13:20 +08:00
JNG
4f544673bb 加一个字段 2026-01-15 16:12:53 +08:00
jiaji.H
ab79cd8833 Updata:解决冲突 2026-01-15 11:34:54 +08:00
jiaji.H
76a08f9ad8 Updata:解决冲突 2026-01-15 11:17:26 +08:00
jiaji.H
8688bd6abd Updata:更新pb文件 2026-01-15 11:09:17 +08:00
cjy
a4bff4284a update: 更新pb 2026-01-14 17:43:00 +08:00
9d1adef700 修改任务列表 2026-01-14 13:52:01 +08:00
81325137a9 修改任务列表 2026-01-14 13:51:12 +08:00
jiaji.H
8d36aeb751 Updata:解决冲突 2026-01-14 13:42:58 +08:00
2425920d34 导出Excel 2026-01-14 10:09:10 +08:00
2ba217c315 导出任务Excel 2026-01-14 10:07:49 +08:00
JNG
a62549e503 Merge branch 'jng-supplier-0105' 2026-01-14 09:39:29 +08:00
jiaji.H
68f2de32ca Merge branch 'main' into feat-hjj-ExportManager 2026-01-13 16:42:40 +08:00
jiaji.H
efe79ec250 Updata:解决冲突 2026-01-13 16:40:05 +08:00
edebd161a1 Merge branch 'feature-h5-daiyb' into dev 2026-01-13 15:57:45 +08:00
d4bf96fef5 修改查询列表 2026-01-13 15:57:38 +08:00
f05e792b83 添加proto文件 2026-01-13 15:38:43 +08:00
f57532630c 添加prot 2026-01-13 15:38:14 +08:00
1b5461d005 修改 2026-01-13 15:37:27 +08:00
cjy
49caaa73c6 feat: 更新pb 2026-01-13 15:15:11 +08:00
0947f8533d 数据统计的作品列表接口 2026-01-13 15:11:18 +08:00
jiaji.H
dca004ecc6 Updata:解决冲突 2026-01-13 14:17:54 +08:00
jiaji.H
b121c12f7c Updata:增加支持多月份导出 2026-01-13 14:09:55 +08:00
0881472841 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-01-13 10:04:54 +08:00
4a3be6bdd4 修改账号添加逻辑 2026-01-13 10:04:51 +08:00
50f2c59c0b 修改逻辑判断 2026-01-13 10:03:47 +08:00
jiaji.H
c5f7903c6c Updata:解决冲突 2026-01-13 09:44:01 +08:00
jiaji.H
065db45cdc Updata:更新pb文件 2026-01-13 09:43:37 +08:00
jiaji.H
3d67be4e09 Updata:解决冲突 2026-01-13 09:39:13 +08:00
jiaji.H
e75e6b7ce9 Updata:增加竞品数pb 2026-01-13 09:36:01 +08:00
cjy
789af8f0db Merge branch 'main' into feat-cjy-report 2026-01-13 09:33:35 +08:00
JNG
e295a58a43 解决冲突 2026-01-12 18:19:21 +08:00