Commit Graph

210 Commits

Author SHA1 Message Date
fc482ff71e 更新cast 2025-06-11 09:54:04 +08:00
69212549c5 合并 2025-06-11 09:22:49 +08:00
fb60eba3e9 合并 2025-06-11 09:19:55 +08:00
7008b4aa2a 完成部分接口 2025-06-11 09:16:11 +08:00
1fa862b85d 解决冲突 2025-06-10 16:17:09 +08:00
8f4dd8aee0 修改 2025-06-10 16:15:57 +08:00
sxy
8629decdc0 Merge branch 'sxy' into dev 2025-06-10 15:03:04 +08:00
sxy
289c5937c5 "套餐修改" 2025-06-10 14:05:57 +08:00
lzh
272d59af4c 添加套餐扩展、扩展记录接口 2025-06-09 14:22:39 +08:00
lzh
d067c785fb Merge branch 'dev-resource-library' into dev-lzh 2025-06-09 13:40:19 +08:00
99520e87d4 完成账号更新 2025-06-06 14:15:37 +08:00
9711496a8b 合并代码 2025-06-06 11:53:54 +08:00
5d7f617c4d Update init.go 2025-06-06 11:46:25 +08:00
4f6101be68 merge 2025-06-06 11:45:47 +08:00
78f4a98993 merge main 2025-06-06 11:44:06 +08:00
lzh
5a8bb4216c 添加素材库接口 2025-06-03 15:58:52 +08:00
d9275166e7 Merge branch 'main' into feature-multicast-daiyb 2025-05-29 14:28:16 +08:00
f7a0e319b5 删除忽略文件 2025-05-29 14:28:00 +08:00
c250930722 Merge branch 'jng' into dev 2025-05-28 15:32:06 +08:00
0b7c37c18b 修改 2025-05-28 15:31:58 +08:00
ed7b95d707 Merge branch 'jng' into dev 2025-05-28 15:04:59 +08:00
34aa4f1b03 修改 2025-05-28 15:04:52 +08:00
jhc
5bbf97eaf2 修改引用问题 2025-05-27 10:56:19 +08:00
jhc
c1978c9ee7 修改冲突 2025-05-27 10:49:22 +08:00
jhc
73f269f847 导出文件 上传 oss 2025-05-27 10:46:36 +08:00
01724622b9 修改 2025-05-26 17:03:07 +08:00
3df1e05aef 修改 2025-05-26 16:31:38 +08:00
d0453c222d 添加cast微服务 2025-05-23 13:25:47 +08:00
48f6eca314 修改 2025-05-23 10:53:16 +08:00
7b5fd0182a 111 2025-05-22 20:19:42 +08:00
c9635a647c fix: 调整payment的proto的service 2025-05-16 14:39:34 +08:00
jhc
5ce9a70c97 Merge branch 'dev' 2025-05-12 15:32:02 +08:00
jhc
69a771a0cb 修改 2025-05-12 15:28:55 +08:00
jhc
9dace756a1 Merge branch 'main' of http://121.228.2.240:9013/fiee/fonchain-fiee 2025-05-12 14:02:20 +08:00
jhc
348ce14ed8 修改 2025-05-12 13:44:09 +08:00
jhc
591a82a9e9 修改 2025-05-12 13:34:00 +08:00
jhc
a07fa1843f 修改 2025-05-12 13:27:53 +08:00
jhc
7643c4ed27 修改 2025-05-12 13:25:04 +08:00
jhc
c5e6c7fe5d 修改 2025-05-12 13:17:17 +08:00
jhc
a615b727fc 修改 2025-05-12 11:43:31 +08:00
jhc
cc9c4f2fe7 修改 2025-05-12 11:22:22 +08:00
jhc
52fb7c301e 修改 2025-05-12 09:38:17 +08:00
jhc
e073be30a1 修改 2025-05-12 09:35:17 +08:00
jhc
fb62be1f46 修改 2025-05-12 09:18:31 +08:00
jhc
90a57845ce 修改 2025-05-09 17:01:51 +08:00
jhc
7a27df806f 修改 2025-05-09 16:58:59 +08:00
jhc
9b94fca511 修改 2025-05-09 16:55:51 +08:00
jhc
6f881cfd9c 修改 2025-05-09 16:52:42 +08:00
jhc
7fc9c57be7 修改 2025-05-09 16:48:45 +08:00
jhc
30a6b5cb7f 修改 2025-05-09 16:42:46 +08:00
jhc
fbd8b91013 修改 2025-05-09 16:38:21 +08:00
jhc
ce90dde920 修改 2025-05-09 16:32:25 +08:00
jhc
b75973df17 修改 2025-05-09 16:26:46 +08:00
jhc
73efea5d23 修改 2025-05-09 16:24:39 +08:00
jhc
ea593f9ba7 修改 2025-05-09 16:15:15 +08:00
jhc
a257d6737e 修改 2025-05-09 15:40:35 +08:00
jhc
6340289cf5 添加导出功能, 财务确认功能 2025-05-09 11:12:33 +08:00
fbd7578058 fix: antom回调动态传channelCode 2025-04-17 15:47:33 +08:00
cee52be722 fix: +日志 2025-04-15 10:40:21 +08:00
fb8bac623c fix: 调整返回 2025-04-15 09:53:36 +08:00
69beac21ff fix: 调整antom支付的返回 2025-04-15 09:45:48 +08:00
736975ed2e fix: 调整创建antom支付的返回 2025-04-15 09:21:39 +08:00
songchuang
7ee1598a3b Merge branch 'sc' into dev 2025-04-14 16:17:37 +08:00
e869c22742 fix: 切换antom支付 2025-04-14 16:12:37 +08:00
edb04ea533 Merge branch 'dev' of http://172.16.100.91:3000/fiee/fonchain-fiee into dev 2025-04-14 15:56:05 +08:00
jhc
eae408d711 xiugai 2025-03-29 10:54:52 +08:00
jhc
016fa3ee72 修改 2025-03-29 10:53:46 +08:00
jhc
e0f3bf742b 修改 2025-03-29 10:46:33 +08:00
jhc
e795a6ab4f 修改 2025-03-29 10:33:27 +08:00
jhc
45424388f7 Merge branch 'dev' of https://gitea-net.fontree.cn/fiee/fonchain-fiee into dev 2025-03-29 10:21:41 +08:00
songchuang
4c59747727 功能添加 2025-03-29 05:03:39 +08:00
songchuang
d5f59b1435 功能添加 2025-03-29 05:02:05 +08:00
songchuang
027bc7b33d fmt注释删除 2025-03-29 03:23:57 +08:00
songchuang
3f9788da42 代码修复 2025-03-29 03:07:39 +08:00
songchuang
3e3c9097de 代码合并 2025-03-29 02:49:48 +08:00
songchuang
6e978f66da 功能添加 2025-03-29 02:22:04 +08:00
songchuang
7e637cc3a0 增项代码上传 2025-03-29 02:08:16 +08:00
jhc
e3c5fc1ff0 修改 2025-03-29 00:50:35 +08:00
b7df304b20 修改 2025-03-29 00:39:15 +08:00
jhc
559a06f697 修改 2025-03-29 00:36:26 +08:00
jhc
20d5abe4b0 xiugai 2025-03-28 22:07:21 +08:00
jhc
f4ac8a2458 修改 2025-03-28 22:05:34 +08:00
jhc
da4a97b37f 修改 2025-03-28 22:02:29 +08:00
jhc
01b26837d5 修改 2025-03-28 19:35:22 +08:00
jhc
e78da0e82a Merge branch 'dev' of https://gitea-net.fontree.cn/fiee/fonchain-fiee into dev 2025-03-28 19:07:33 +08:00
jhc
0b80679aa0 签署文件菲碧川 2025-03-28 19:07:20 +08:00
songchuang
31bf3f9a11 新字段添加 2025-03-28 18:51:15 +08:00
songchuang
a0ec3c4a7a 检验是否生成订单代码上传 2025-03-28 16:48:23 +08:00
songchuang
b1399934bf bug修复 2025-03-28 15:10:27 +08:00
songchuang
fb1295d561 增值代码上传 2025-03-28 09:25:54 +08:00
sxy
417309d0b7 增加增值套餐服务 2025-03-25 16:35:13 +08:00
sxy
f0acd9503d 增加增值套餐服务 2025-03-25 16:30:58 +08:00
jhc
c7de8975f7 修改 2025-03-12 22:14:38 +08:00
jhc
cdf8cdcb08 修改 2025-03-12 20:56:50 +08:00
jhc
1ae5df7386 Merge branch 'dev' of https://gitea-net.fontree.cn/fiee/fonchain-fiee into dev 2025-03-12 20:05:49 +08:00
jhc
11d8cea16d 修改 2025-03-12 20:05:37 +08:00
e142a0bfeb Merge branch 'jng' into dev 2025-03-12 16:19:10 +08:00
cdc99eb4de 修改 2025-03-12 16:19:02 +08:00
jhc
37d1b2ca25 修改 2025-03-12 16:12:38 +08:00
jhc
e1287b2276 修改 2025-03-12 15:58:23 +08:00