Commit Graph

772 Commits

Author SHA1 Message Date
lzh
a16f0b6d54 Merge branch 'dev-lzh' into dev 2025-06-26 16:12:58 +08:00
lzh
fe9f4dcc95 调整资源原始文件鉴权 2025-06-26 16:12:50 +08:00
87db2d6ce3 Merge branch 'feature-multicast-daiyb' into dev 2025-06-26 09:21:32 +08:00
62efe6a80d 短信通知 2025-06-26 09:19:18 +08:00
lzh
5ae25cabc6 添加日志打印 2025-06-26 09:08:08 +08:00
lzh
e4d6b5de90 Merge branch 'dev-lzh' into dev 2025-06-25 16:52:19 +08:00
lzh
ab135ed80e 修复作品确认接口的提前返回问题 2025-06-25 16:52:11 +08:00
cd40e1c9ca Merge branch 'chat' 2025-06-25 15:53:57 +08:00
df3c90476b Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-25 15:51:30 +08:00
4cc70d4b2f Merge branch 'chat' into dev 2025-06-25 15:50:03 +08:00
2ea9d6bc45 Update handler.go 2025-06-25 15:49:52 +08:00
9e3445319b Update work.go 2025-06-25 14:16:21 +08:00
0a9d8f628d Merge branch 'feature-multicast-daiyb' into dev 2025-06-25 11:09:30 +08:00
85567c24a5 Update work.go 2025-06-25 11:08:55 +08:00
ce9deac980 1 2025-06-25 10:25:24 +08:00
f26492218b Merge branch 'feature-multicast-daiyb' into dev 2025-06-24 18:28:17 +08:00
e0d7b3775c 添加作品数量 2025-06-24 18:27:55 +08:00
0545372341 Merge branch 'feature-multicast-daiyb' into dev 2025-06-24 16:38:41 +08:00
b9ca6c67ef 添加取号 2025-06-24 16:38:26 +08:00
3890d74c0c 添加取号 2025-06-24 16:33:06 +08:00
b5ec90382f 1 2025-06-24 16:01:50 +08:00
749ce934e8 Merge branch 'feature-multicast-daiyb' into dev 2025-06-24 15:44:16 +08:00
422b426c37 添加日志 2025-06-24 15:43:38 +08:00
00a9acdb9b Merge branch 'jng' into dev 2025-06-24 14:39:06 +08:00
786347f0d5 修改 2025-06-24 14:38:34 +08:00
2b5dd8d977 Merge branch 'feature-multicast-daiyb' into dev 2025-06-24 13:56:56 +08:00
490b0d7787 添加合同删除 2025-06-24 13:56:22 +08:00
953eb4b419 Merge branch 'feature-multicast-daiyb' into dev 2025-06-24 13:20:24 +08:00
62c48b2ea9 修改日志排序 2025-06-24 13:19:41 +08:00
b4c90f4d18 Merge branch 'jng' into dev 2025-06-24 10:59:42 +08:00
090538be0d 修改 2025-06-24 10:55:59 +08:00
lzh
f8b5df1f42 Merge branch 'dev-lzh' into dev 2025-06-24 09:42:24 +08:00
lzh
a6a04bf263 添加跨域支持 2025-06-24 09:42:17 +08:00
lzh
1d3f2cd0f7 删除调试信息 2025-06-24 09:41:24 +08:00
lzh
cdf2af27ba 调试 2025-06-23 16:45:59 +08:00
lzh
c60e04454a 调试 2025-06-23 16:40:17 +08:00
lzh
9c97c426d6 删除调试 2025-06-23 16:31:10 +08:00
sxy
4f0fcc77a1 Merge branch 'sxy' into dev 2025-06-23 16:29:00 +08:00
sxy
4344f1ff2c 修改多语言msg 2025-06-23 16:28:39 +08:00
lzh
5291bb489a 调试 2025-06-23 16:27:31 +08:00
lzh
8082f229f4 Merge branch 'dev-lzh' into dev 2025-06-23 16:17:19 +08:00
lzh
beb0ab72ab 确认列表过滤 2025-06-23 16:17:10 +08:00
19baa34ca5 Merge branch 'feat-zjy-issue-008' into dev 2025-06-23 15:54:28 +08:00
382a32bec4 fix: 处理金额比较问题 2025-06-23 15:53:04 +08:00
d5546933f9 修改 2025-06-23 15:40:00 +08:00
80759ec111 解决冲突 2025-06-23 15:32:57 +08:00
94cf7ba83e 修改 2025-06-23 15:31:34 +08:00
5c92a1fef7 Merge branch 'jng' into dev 2025-06-23 15:15:46 +08:00
0788c6a770 修改 2025-06-23 15:14:53 +08:00
c34cc285bb Merge branch 'feature-multicast-daiyb' into dev 2025-06-20 16:42:04 +08:00
7588bf4b28 绑定 2025-06-20 16:41:24 +08:00
ae33bf910a 修改 2025-06-20 15:52:44 +08:00
a3f38b8377 修改 2025-06-20 15:51:16 +08:00
sxy
df829bb4d9 Merge branch 'sxy' into dev 2025-06-20 15:30:38 +08:00
sxy
e53d3decd7 修改多语言msg-1 2025-06-20 15:30:27 +08:00
sxy
96b04aa609 Merge branch 'sxy' into dev 2025-06-20 14:58:06 +08:00
sxy
81115cee52 修改多语言msg 2025-06-20 14:57:53 +08:00
b51d4d39ca Update approval.go 2025-06-20 13:32:44 +08:00
sxy
74f71fb0b6 Merge branch 'sxy' into dev 2025-06-20 13:12:01 +08:00
sxy
42eac3d70b 修改bug-msg 2025-06-20 13:10:00 +08:00
9cd32ec899 Merge remote-tracking branch 'origin/dev' into dev 2025-06-20 11:49:11 +08:00
18161e8528 Merge branch 'feat-zjy-issue-008' into dev 2025-06-20 11:48:42 +08:00
cf413538fa fix: 处理bug 2025-06-20 11:48:20 +08:00
42522327a5 1 2025-06-20 11:46:06 +08:00
sxy
fa898aee00 Merge branch 'sxy' into dev 2025-06-20 11:42:21 +08:00
sxy
051f4d9f1d 修改bug 2025-06-20 11:42:04 +08:00
c56465dd18 Merge branch 'feat-zjy-issue-008' into dev 2025-06-20 11:27:21 +08:00
c20c6871c9 fix: 处理冲突,增加自行购买 2025-06-20 11:26:16 +08:00
383f8bef10 Merge branch 'jng' into feat-zjy-issue-008
# Conflicts:
#	api/bundle/bundle.pb.go
#	api/bundle/bundle_triple.pb.go
2025-06-20 11:21:22 +08:00
sxy
2b6c2123c9 Merge branch 'sxy' into dev 2025-06-20 11:15:16 +08:00
sxy
87e9701f72 修改h5 list接口 2025-06-20 11:15:01 +08:00
c478f4015a Merge remote-tracking branch 'origin/dev' into dev 2025-06-20 11:13:21 +08:00
1334fcaa4c Merge branch 'feature-multicast-daiyb' into dev 2025-06-20 11:12:10 +08:00
f1d81778d0 Merge branch 'feat-zjy-issue-008' into dev 2025-06-20 11:12:00 +08:00
e663606c78 Update work.go 2025-06-20 11:11:49 +08:00
acf472f1ef fix: 注掉没用信息,太强说会更新两次 2025-06-20 11:02:48 +08:00
9bb1cbc840 Merge branch 'feat-zjy-issue-008' into dev 2025-06-20 10:24:18 +08:00
7c6edab53d fix: 去掉单独购买增值服务的0远金额限制 2025-06-20 10:23:32 +08:00
lzh
139901467f Merge branch 'dev-lzh' into dev 2025-06-20 09:44:39 +08:00
lzh
320e110f8c 补充缺失字段 2025-06-20 09:44:03 +08:00
851fdc5098 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-19 16:43:08 +08:00
8c2cff4973 Update handler.go 2025-06-19 16:42:42 +08:00
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
0885aa1ed0 Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev 2025-06-19 16:19:27 +08:00
5d8b72b499 fix: 解决冲突 2025-06-19 16:17:32 +08:00
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
2facb5c0fb Merge branch 'chat' 2025-06-19 15:07:05 +08:00
lzh
de98e69033 Merge branch 'dev-lzh' into dev 2025-06-19 15:06:08 +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