Commit Graph

807 Commits

Author SHA1 Message Date
60498f8af9 解决冲突 2025-06-19 15:34:17 +08:00
8cfcbf345e 修改 2025-06-19 15:32:54 +08:00
lzh
cf95f2b9fe Merge branch 'dev-lzh' into dev 2025-06-19 15:13:41 +08:00
lzh
a6e83c162d 添加扩展类型字段 2025-06-19 15:13:36 +08:00
lzh
c0be49a610 添加扩展类型字段 2025-06-19 15:13:15 +08:00
lzh
dff14a45be 更新proto文件 2025-06-19 15:12:32 +08:00
lzh
f3882fd709 更新proto 2025-06-19 15:11:05 +08:00
lzh
de98e69033 Merge branch 'dev-lzh' into dev 2025-06-19 15:06:08 +08:00
lzh
686a57ebc5 更新proto文件 2025-06-19 15:06:01 +08:00
e03bd54b11 fix: 解决冲突 2025-06-19 14:41:13 +08:00
bc17428bd6 fix: 增加筛选过滤 2025-06-19 14:40:09 +08:00
301e94808d Update chat.go 2025-06-19 14:23:01 +08:00
4c842559a7 Update chat.go 2025-06-19 14:14:11 +08:00
ef57eb0e89 Update chat.go 2025-06-19 14:09:37 +08:00
e994c11e29 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-19 14:05:00 +08:00
b1a7e1f2de Update robot.go 2025-06-19 14:04:41 +08:00
d1191753f3 Merge branch 'feat-zjy-issue-008' into dev 2025-06-19 13:57:52 +08:00
6eb8e2cef8 fix: 处理订单金额是0的情况,直接返回 2025-06-19 13:57:12 +08:00
1723ba99dd Update robot.go 2025-06-19 13:56:53 +08:00
e66f33b1a9 Update ruler_keywords.go 2025-06-19 13:50:44 +08:00
a6c7544b91 fix: 增加日志 2025-06-19 13:43:07 +08:00
9bb4bec9f8 fix: 覆盖聊天相关代码 2025-06-19 13:23:56 +08:00
0e99dc7a0b Update chatRoom.go 2025-06-19 12:41:11 +08:00
ebaeac28fb Merge branch 'chat' into dev 2025-06-19 12:35:11 +08:00
293f3e5c09 fix: 修复不同类型的回复规则同时生效的问题 2025-06-19 12:34:54 +08:00
fe755bbe13 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-19 11:55:04 +08:00
sxy
5c8a7ac056 Merge branch 'sxy' into dev 2025-06-19 11:53:58 +08:00
bc795d3f20 Update handler.go 2025-06-19 11:53:53 +08:00
sxy
d96222ba1e 修改错误信息返回 2025-06-19 11:53:45 +08:00
55b6ae810d debug1 2025-06-19 11:45:55 +08:00
e0b15430be Update ruler_keywords.go 2025-06-19 11:41:31 +08:00
c4a50362f5 Update chat.go 2025-06-19 11:32:57 +08:00
2455067913 Merge branch 'chat' into dev 2025-06-19 11:31:46 +08:00
d1d305a638 fix: 找回丢失的代码 2025-06-19 11:31:15 +08:00
24b5560c9c Merge branch 'chat' into dev 2025-06-19 11:14:02 +08:00
3a94e21ab3 Update robot.go 2025-06-19 11:13:50 +08:00
d2eefbb646 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-19 11:12:52 +08:00
4afa15ee3f Merge branch 'chat' into dev 2025-06-19 11:12:27 +08:00
2757de0f03 fix: update 2025-06-19 11:12:15 +08:00
a093585416 Merge branch 'dev' of http://172.16.100.91:3000/fiee/fonchain-fiee into dev 2025-06-19 11:05:29 +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
c0148238f0 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-19 11:04:32 +08:00
c33833b008 fix: 解决冲突 2025-06-19 11:04:13 +08:00
e1d750c24a fix: 重构回复规则校验逻辑 2025-06-19 11:02:27 +08:00
bacedd206f Merge branch 'jng' into dev 2025-06-19 10:34:02 +08:00
a9474f1a3d 修改 2025-06-19 10:32:44 +08:00
17e3b6513f fix: debug4 2025-06-19 10:24:35 +08:00
e97bd859fc debug3 2025-06-19 10:24:35 +08:00
eaf04ae02d fix: debug2 2025-06-19 10:24:35 +08:00