Commit Graph

3025 Commits

Author SHA1 Message Date
fd7928f5b3 Merge branch 'fearture-newScript-daiyb' into dev 2026-02-10 14:03:14 +08:00
061af70b4f 修改提示 2026-02-10 14:03:09 +08:00
jiaji.H
1118fdc225 Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev 2026-02-10 11:44:46 +08:00
jiaji.H
2186871b1b Updata:更新路径 2026-02-10 11:44:38 +08:00
1a9f538001 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-10 11:36:15 +08:00
22bcf4207a Merge branch 'fearture-newScript-daiyb' into dev 2026-02-10 11:36:09 +08:00
a35e0f7d69 脚本加上黄反 2026-02-10 11:36:04 +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
abfe54b500 Merge branch 'fearture-newScript-daiyb' into dev 2026-02-10 11:30:53 +08:00
0ecdef7a4e Update work.go 2026-02-10 11:30:47 +08:00
2e0dea7883 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-10 11:27:59 +08:00
324830cc6b Merge branch 'fearture-newScript-daiyb' into dev 2026-02-10 11:27:58 +08:00
436641a181 修改黄反提示 2026-02-10 11:27:52 +08:00
cjy
69e775559a feat:导出excel增加竞品报告相关字段 2026-02-10 11:18:24 +08:00
73e8077a40 Merge branch 'fearture-newScript-daiyb' into dev 2026-02-10 11:13:51 +08:00
35afb07cb9 Update work.go 2026-02-10 11:13:44 +08:00
jiaji.H
00be8ca5db Updata:更新发票下载接口 2026-02-10 11:12:06 +08:00
e4610a5088 Merge branch 'fearture-newScript-daiyb' into dev 2026-02-10 10:45:28 +08:00
a60f8a5d76 修改黄反提示 2026-02-10 10:45:18 +08:00
jiaji.H
df6f60c172 Updata:调整发票日期 2026-02-10 09:45:56 +08:00
cjy
2e0f9b738a feat:增加带任务uuid的创建接口 2026-02-09 19:07:24 +08:00
cjy
db77b32a5a fix:修改种子 2026-02-09 17:41:56 +08:00
fa028e8ad2 Merge branch 'fearture-newScript-daiyb' into dev 2026-02-09 15:15:12 +08:00
2663a3562f 内容鉴定 2026-02-09 15:15:05 +08:00
2942b3ad6d Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-09 15:10:33 +08:00
f903c56467 Merge branch 'fearture-newScript-daiyb' into dev 2026-02-09 15:10:25 +08:00
ae5c3de6c4 黄反检测 2026-02-09 15:10:19 +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
388216d7dc Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-09 14:59:45 +08:00
ad5ffd10c9 Merge branch 'feature-scriptApproval-daiyb' into dev 2026-02-09 14:59:41 +08:00
ce001802ba Update task.go 2026-02-09 14:59:36 +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
cjy
e59353514b feat: 增加查看指派任务的已完成的数据接口 2026-02-09 14:58:31 +08:00
27137508f7 Merge branch 'feature-scriptApproval-daiyb' into dev 2026-02-09 14:24:32 +08:00
2cb12418a8 Update task.go 2026-02-09 14:24:24 +08:00
372af8d0e5 审批时间 2026-02-09 14:23:50 +08:00
4aded4cbd3 Merge branch 'feature-scriptApproval-daiyb' into dev 2026-02-09 14:16:28 +08:00
0ec5f1ee60 Update task.go 2026-02-09 14:16:17 +08:00
jiaji.H
255be4472b Updata:临时增加刷发票接口 2026-02-09 13:30:44 +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
637b5cd593 Merge branch 'fix-cjy-addLog' into dev 2026-02-09 09:03:44 +08:00
cjy
57e7629e2f Revert "增加一点日志"
This reverts commit 7ffede212d.
2026-02-09 09:03:22 +08:00
4fd1f7c08a Merge branch 'fix-import-script-daiyb' into dev 2026-02-06 19:42:46 +08:00
5e10fe8bb0 优化脚本导入自己不能同时导入2个 2026-02-06 19:42:39 +08:00