Commit Graph

292 Commits

Author SHA1 Message Date
5706c238a4 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-14 14:49:31 +08:00
75231bab91 fix: 解决冲突 2025-06-14 14:48:34 +08:00
c81b87d824 feat: 客服聊天 2025-06-14 14:46:01 +08:00
lzh
d1468434b6 Merge branch 'dev-lzh' into dev 2025-06-14 13:54:16 +08:00
lzh
ae7b87aa17 添加作品记录和详情接口 2025-06-14 13:52:51 +08:00
lzh
bef40ad0f1 Merge remote-tracking branch 'origin/feature-multicast-daiyb' into dev-lzh 2025-06-14 13:31:29 +08:00
lzh
a41962ba8d 添加使用记录接口 2025-06-14 13:29:05 +08:00
lzh
bb36d88c98 补齐依赖 2025-06-14 13:21:02 +08:00
lzh
0d28141f65 Merge remote-tracking branch 'origin/jng' into dev-lzh 2025-06-14 13:20:21 +08:00
58b0ca77e1 Merge branch 'jng' into dev 2025-06-14 11:29:27 +08:00
99cfbbf6f7 添加订单详情接口 2025-06-14 11:29:21 +08:00
lzh
4f9f8e66db 解决冲突 2025-06-14 10:33:53 +08:00
8196e14159 Merge branch 'jng' into dev 2025-06-14 10:23:16 +08:00
d4b50302fa 添加轮播接口 2025-06-14 10:22:02 +08:00
lzh
d4e00229fa Merge branch 'dev-lzh' into dev 2025-06-14 09:50:35 +08:00
lzh
e447ff1d42 素材库添加鉴权 2025-06-14 09:50:12 +08:00
36dc2dd194 解决冲突 2025-06-13 22:39:14 +08:00
8449969682 修改 2025-06-13 22:38:03 +08:00
ec0ad25aec 解决冲突 2025-06-13 19:29:19 +08:00
a439342ba2 修改订单创建 2025-06-13 19:25:39 +08:00
829928da9b 添加审批 2025-06-13 19:02:00 +08:00
129d3fafa1 更新审批 2025-06-13 19:00:38 +08:00
2e46cfaacd Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-13 15:29:37 +08:00
8570541f76 Merge branch 'chat' into dev 2025-06-13 15:29:12 +08:00
b979be1484 fix: 修复聊天中的token校验问题 2025-06-13 15:28:23 +08:00
sxy
1b1db8e0aa Merge branch 'sxy-sec' into dev 2025-06-13 14:44:43 +08:00
sxy
8d9260aca5 修改返回数据 2025-06-13 14:44:24 +08:00
lzh
d8ef69090d Merge branch 'dev-lzh' into dev 2025-06-13 14:35:27 +08:00
lzh
34a724268a 修改接口路径 2025-06-13 14:34:28 +08:00
lzh
fd6d763431 添加扩展、余量接口 2025-06-13 14:23:06 +08:00
c22977816b 解决冲突 2025-06-13 14:16:35 +08:00
4a30ddad23 修改 2025-06-13 14:02:34 +08:00
lzh
11b0192a23 添加扩展和余量接口 2025-06-13 14:00:29 +08:00
126360113d Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-13 11:05:18 +08:00
3e80d15355 Merge branch 'chat' into dev 2025-06-13 11:04:47 +08:00
fb076dd4db feat: update 2025-06-13 11:04:33 +08:00
sxy
7ea561bb01 Merge branch 'sxy-sec' into dev 2025-06-13 10:54:13 +08:00
sxy
a63b001e5b 修改 2025-06-13 10:53:59 +08:00
sxy
efdebf8949 Merge branch 'sxy-sec' into dev 2025-06-13 10:49:32 +08:00
sxy
76e30e9211 修改冲突 2025-06-13 10:47:42 +08:00
0c7db6d312 Merge branch 'chat' into dev 2025-06-13 10:44:36 +08:00
a92cca188d fix: 优化注册聊天用户逻辑 2025-06-13 10:44:25 +08:00
sxy
49a935d6c6 修改 2025-06-13 10:34:36 +08:00
71e504afc5 Merge branch 'chat' into dev 2025-06-13 10:30:23 +08:00
af0fefc3bd Update wsMessageHandle.go 2025-06-13 10:30:11 +08:00
lzh
896145b718 Merge branch 'dev-lzh' into dev 2025-06-12 19:47:06 +08:00
lzh
44d5704606 修改请求方法 2025-06-12 19:46:55 +08:00
lzh
f381ffa185 Merge branch 'dev-lzh' into dev 2025-06-12 19:42:19 +08:00
lzh
816d1e108e 修改请求方法 2025-06-12 19:42:12 +08:00
637cad4298 fix: 解决go.mod 冲突 2025-06-12 19:38:03 +08:00