Commit Graph

179 Commits

Author SHA1 Message Date
sxy
af9c443686 Merge branch 'sxy' into dev 2025-06-19 16:24:11 +08:00
sxy
736e3b1bd0 修改H5套餐列表 2025-06-19 16:19:37 +08:00
60498f8af9 解决冲突 2025-06-19 15:34:17 +08:00
8cfcbf345e 修改 2025-06-19 15:32:54 +08:00
lzh
de98e69033 Merge branch 'dev-lzh' into dev 2025-06-19 15:06:08 +08:00
9e1080659a Merge branch 'feature-multicast-daiyb' into dev 2025-06-19 11:05:21 +08:00
480551a738 添加重新发布 2025-06-19 11:04:37 +08:00
lzh
661eb9c72a 添加跨域处理 2025-06-17 19:34:42 +08:00
sxy
e4554dd0ad Merge branch 'sxy-sec' into dev 2025-06-17 18:30:56 +08:00
sxy
8f8e28ca3d 修改 2025-06-17 18:30:36 +08:00
sxy
ec7be8fde0 Merge branch 'sxy-sec' into dev 2025-06-17 14:46:24 +08:00
sxy
8d28627e5f 修改接口认证 2025-06-17 14:46:09 +08:00
lzh
cb707c96e1 Merge branch 'dev-lzh' into dev 2025-06-17 14:28:29 +08:00
lzh
5ad6d318e0 添加确认变更的接口 2025-06-17 14:27:43 +08:00
sxy
64f151d87f Merge branch 'sxy-sec' into dev 2025-06-17 14:21:33 +08:00
sxy
0a5cb9f175 修改接口认证 2025-06-17 14:21:18 +08:00
sxy
d4eebacbda Merge branch 'sxy-sec' into dev 2025-06-17 14:07:50 +08:00
sxy
d14dbaaf99 修改官网数据 2025-06-17 14:07:30 +08:00
lzh
cfaaf818c8 Merge branch 'dev-lzh' into dev 2025-06-16 14:11:17 +08:00
lzh
8a13754309 素材库路径修改 2025-06-16 14:11:11 +08:00
lzh
16661dfe33 Merge branch 'dev-lzh' into dev 2025-06-16 13:55:55 +08:00
lzh
b29c2fcad3 匹配路径修改 2025-06-16 13:54:42 +08:00
lzh
24c3d1c894 Merge branch 'dev-lzh' into dev 2025-06-16 13:47:32 +08:00
lzh
c07d4a3abb 修改预览接口路径 2025-06-16 13:47:14 +08:00
98b0893b0c Merge branch 'feat-zjy-issue-008' into dev 2025-06-16 13:06:01 +08:00
af9a59227f fix: 新增app端的根据orderNo查询子套餐 2025-06-16 13:05:29 +08:00
40c0a9d65f Merge branch 'feature-multicast-daiyb' into dev 2025-06-16 11:06:32 +08:00
92364e194f merge jng 2025-06-16 10:53:22 +08:00
abe68c7f6e 1 2025-06-16 10:37:18 +08:00
sxy
1648689c02 Merge branch 'sxy-sec' into dev 2025-06-16 09:31:40 +08:00
sxy
549b5f05c6 增加 form list 2025-06-16 09:31:23 +08:00
cf18598b96 Merge branch 'jng' into feat-zjy-issue-008
# Conflicts:
#	api/bundle/bundle.pb.go
2025-06-15 20:54:42 +08:00
ce95cface5 Merge branch 'feat-zjy-issue-008' into dev
# Conflicts:
#	api/bundle/bundle.pb.go
#	pkg/router/bundle.go
#	pkg/service/bundle/bundleProfile.go
2025-06-15 19:22:14 +08:00
057565b0aa fix: 新增接口,根据orderNo,仅查询它单独购买的增值服务,调整支付创建时候仅增值的情况 2025-06-15 19:19:10 +08:00
f60f7c4a6a Merge branch 'jng' into dev 2025-06-15 15:59:46 +08:00
d332b0e1d4 修改 2025-06-15 15:59:40 +08:00
lzh
7e9f25fffe Merge branch 'dev-lzh' into dev 2025-06-15 15:54:04 +08:00
lzh
cc591a2e04 磁盘使用率接口 2025-06-15 15:53:57 +08:00
729c9e661c 解决冲突 2025-06-15 15:32:25 +08:00
8000f56c06 修改 2025-06-15 15:27:51 +08:00
lzh
0d46dd75d8 冲突解决 2025-06-15 12:56:05 +08:00
lzh
26c0056b12 Merge branch 'dev-lzh' into dev 2025-06-15 12:22:38 +08:00
lzh
d3b16ace79 作品确认、用户余量信息 2025-06-15 12:18:50 +08:00
3f43441c4f Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-15 10:21:29 +08:00
c665b2190c Merge branch 'chat' into dev 2025-06-15 10:21:11 +08:00
f41e053e08 feat: debug 2025-06-15 10:20:36 +08:00
abc498f656 解决冲突 2025-06-15 10:09:39 +08:00
eb3e1f809b 修改 2025-06-15 10:06:57 +08:00
64f73ca075 Merge branch 'dev' of http://172.16.100.91:3000/fiee/fonchain-fiee into dev 2025-06-14 19:48:08 +08:00
ec631334d6 APP接口 2025-06-14 19:47:36 +08:00