|
|
e90a167f9a
|
Merge branch 'feature-scriptApproval-daiyb'
|
2026-02-09 14:59:51 +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 |
|
|
|
02aa3fa3d9
|
update:更新pb
# Conflicts:
# api/cast/cast.pb.go
# Conflicts:
# api/bundle/bundle.validator.pb.go
|
2026-02-09 14:58:55 +08:00 |
|
|
|
e59353514b
|
feat: 增加查看指派任务的已完成的数据接口
|
2026-02-09 14:58:31 +08:00 |
|
|
|
74c66abad7
|
修改审批
|
2026-02-09 14:53:50 +08:00 |
|
|
|
d14778017e
|
update:更新pb
# Conflicts:
# api/cast/cast.pb.go
|
2026-02-09 14:47:21 +08:00 |
|
|
|
d079abbe50
|
feat: 增加查看指派任务的已完成的数据接口
|
2026-02-09 14:47:08 +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
|
295796ae1a
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225'
|
2026-02-09 13:30:54 +08:00 |
|
jiaji.H
|
255be4472b
|
Updata：临时增加刷发票接口
|
2026-02-09 13:30:44 +08:00 |
|
|
|
05774fcb3b
|
fix：修改时间戳格式化
|
2026-02-09 12:50:13 +08:00 |
|
|
|
7ee7bd7370
|
update:pb文件
|
2026-02-09 12:47:15 +08:00 |
|
|
|
c399689be0
|
fix: 避免空指针
|
2026-02-09 12:37:44 +08:00 |
|
|
|
cea0b741f8
|
fix:修改判断查询失败的逻辑
|
2026-02-09 12:37:26 +08:00 |
|
|
|
c941a46cee
|
fix:续费的话，查询续费开始到现在套餐的时间所有数据
# Conflicts:
# api/bundle/bundle.pb.go
# api/cast/cast.pb.go
# pkg/service/cast/analysis.go
# pkg/service/cast/report.go
|
2026-02-09 12:36:51 +08:00 |
|
|
|
31a08879b6
|
fix:如果套餐为续费套餐直接失败
# Conflicts:
# api/cast/cast.pb.go
|
2026-02-09 11:58:14 +08:00 |
|
|
|
8ec97fdcff
|
fix:创建竞品报告时，传入订单uuid
|
2026-02-09 11:55:17 +08:00 |
|
|
|
063a7991ba
|
Merge branch 'fix-cjy-baseOnjng'
# Conflicts:
# api/cast/cast.pb.go
# api/cast/cast.pb.validate.go
|
2026-02-09 11:53:30 +08:00 |
|
|
|
59ece0cb7f
|
Merge branch 'feat-cjy-changeOperator'
# Conflicts:
# api/cast/cast.pb.go
# api/cast/cast.pb.validate.go
# pkg/cron/task.go
|
2026-02-09 11:52:07 +08:00 |
|
jiaji.H
|
4530e68c11
|
Updata：解决冲突
|
2026-02-09 11:46:18 +08:00 |
|
jiaji.H
|
f751d84943
|
Updata：解决冲突
|
2026-02-09 11:33:38 +08:00 |
|
|
|
0a1678da58
|
11
|
2026-02-09 11:33:14 +08:00 |
|
|
|
e1a75ee420
|
解决冲突
|
2026-02-09 11:31:22 +08:00 |
|
|
|
195ac2a769
|
fiee5️⃣期需求
账号过期解绑
|
2026-02-09 11:30:22 +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 |
|
|
|
637b5cd593
|
Merge branch 'fix-cjy-addLog' into dev
|
2026-02-09 09:03:44 +08:00 |
|
|
|
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 |
|
|
|
b58e02a5ae
|
fix: 避免空指针
|
2026-02-06 19:24:20 +08:00 |
|
|
|
9c6029c20b
|
fix：修改时间戳格式化
|
2026-02-06 18:36:12 +08:00 |
|
|
|
ee64ecd246
|
Merge branch 'feature-special-daiyb' into dev
|
2026-02-06 18:21:38 +08:00 |
|
|
|
23cf5af6dc
|
修改上下文解析
|
2026-02-06 18:21:33 +08:00 |
|
|
|
920098c6c3
|
Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev
|
2026-02-06 17:24:26 +08:00 |
|
|
|
ec009e2eb1
|
Merge branch 'feature-special-daiyb' into dev
|
2026-02-06 17:24:24 +08:00 |
|
|
|
e74bf2f911
|
修改种子
|
2026-02-06 17:24:18 +08:00 |
|
|
|
ce0fb99ed6
|
fix:修改判断查询失败的逻辑
|
2026-02-06 17:12:05 +08:00 |
|
|
|
0142be0dc6
|
fix:续费的话，查询续费开始到现在套餐的时间所有数据
|
2026-02-06 17:00:38 +08:00 |
|
|
|
e671b6817c
|
Merge branch 'feature-special-daiyb' into dev
|
2026-02-06 16:41:19 +08:00 |
|
