Commit Graph

1752 Commits

Author SHA1 Message Date
jiaji.H
ab79cd8833 Updata:解决冲突 2026-01-15 11:34:54 +08:00
jiaji.H
76a08f9ad8 Updata:解决冲突 2026-01-15 11:17:26 +08:00
cjy
e9cd6876c2 feat: 增加分布式锁,防止重复提交 2026-01-14 18:56:59 +08:00
cjy
9bd8e67116 Merge branch 'feat-cjy-report' into dev
# Conflicts:
#	pkg/model/cast/work.go
2026-01-14 17:43:51 +08:00
cjy
d811235da5 fix:移除注释 2026-01-14 17:09:13 +08:00
cjy
bdf3fa6144 feat:pdf上传完之后就删除 2026-01-14 17:08:55 +08:00
cjy
dfb2e5e037 fix: 修复逻辑错误 2026-01-14 17:04:41 +08:00
cjy
6b52775913 feat:增加自动生成pdf功能 2026-01-14 16:47:52 +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
cjy
ae76287088 feat: 把单个艺人竞品报告的接口的分开 2026-01-14 11:58:20 +08:00
2425920d34 导出Excel 2026-01-14 10:09:10 +08:00
2ba217c315 导出任务Excel 2026-01-14 10:07:49 +08:00
cjy
13fa87ec2b feat:source固定为1 2026-01-14 09:42:46 +08:00
jiaji.H
5d3c21624c Updata:更新视频上传数据导出 2026-01-13 16:43:17 +08:00
jiaji.H
68f2de32ca Merge branch 'main' into feat-hjj-ExportManager 2026-01-13 16:42:40 +08:00
cjy
fbf24995b8 feat:减少前端需要传的字段 2026-01-13 16:40:25 +08:00
jiaji.H
efe79ec250 Updata:解决冲突 2026-01-13 16:40:05 +08:00
cjy
a3e617a87f feat:批量导入增加校验竞品报告的余额 2026-01-13 16:20:00 +08:00
cjy
8fa9f89db9 feat:批量导入竞品报告 2026-01-13 16:15:06 +08:00
jiaji.H
b474856f35 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-01-13 16:12:37 +08:00
jiaji.H
0fd6319e34 Updata:更新导出 2026-01-13 16:12:32 +08:00
beac4f775d Update test.go 2026-01-13 16:07:55 +08:00
jiaji.H
1886935f4d Updata:更新导出 2026-01-13 16:00:32 +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
cjy
e6ca737fb1 feat:增加一个作品列表接口 2026-01-13 15:19:13 +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
cjy
b079b597c3 feat: 增加检验竞品报告余额 2026-01-13 11:24:50 +08:00
bx1834938347-prog
6ab28792ec Merge branch 'wwq' into dev 2026-01-13 11:15:59 +08:00
bx1834938347-prog
fcc838ff43 Update cron.go 2026-01-13 11:15:30 +08:00
JNG
b7f8524861 Merge branch 'jng-supplier-0105' into dev 2026-01-13 10:49:34 +08:00
JNG
f4a3d39df6 Update supplier.go 2026-01-13 10:49:26 +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
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
cjy
09f598a1f4 feat: 增加自动审批 2026-01-12 18:34:56 +08:00
JNG
44dd68fd84 Merge branch 'jng-code-0112' 2026-01-12 18:08:55 +08:00
cjy
cf6a932dbb Merge branch 'feat-cjy-tag' into dev 2026-01-12 16:49:23 +08:00
cjy
3286f12505 fix: 随机选key 2026-01-12 16:49:10 +08:00
cjy
a6e5d38a43 feat: 增加导出excel接口 2026-01-12 14:45:52 +08:00
cf99647d57 Update test.go 2026-01-12 14:41:04 +08:00
JNG
e5362cb262 解决冲突 2026-01-12 14:39:24 +08:00
JNG
7798f19d2b 添加邀请人 2026-01-12 14:38:49 +08:00
e2e4df84fc Merge branch 'feature-userinfo-daiyb' into dev 2026-01-12 14:35:39 +08:00