|
|
18524598d4
|
Merge branch 'feature-tiktok-daiyb' into dev
|
2025-09-24 11:58:27 +08:00 |
|
|
|
97f79df433
|
Update media.go
|
2025-09-24 11:58:22 +08:00 |
|
|
|
7359d9cd57
|
Merge branch 'feature-tiktok-daiyb' into dev
|
2025-09-24 11:56:50 +08:00 |
|
|
|
e037f91507
|
Update media.go
|
2025-09-24 11:56:42 +08:00 |
|
|
|
f3367ccf22
|
Merge branch 'feature-tiktok-daiyb' into dev
|
2025-09-24 11:47:21 +08:00 |
|
|
|
b35278771e
|
跳转
|
2025-09-24 11:47:16 +08:00 |
|
|
|
38e7e1aac6
|
fix: 自动刷订单的，过期时间10年变1年
|
2025-09-23 16:20:21 +08:00 |
|
|
|
8b0e0edae8
|
Merge branch 'dev-lzh-0923' into dev
|
2025-09-23 14:26:39 +08:00 |
|
|
|
e33aaac2b9
|
导入日志shuhcu
|
2025-09-22 18:31:51 +08:00 |
|
|
|
430304cd1e
|
导入修改url-1
|
2025-09-22 18:27:00 +08:00 |
|
|
|
b4520ccf94
|
导入修改url
|
2025-09-22 17:03:18 +08:00 |
|
|
|
c8d656bb62
|
Merge branch 'dev' of http://172.16.100.91:3000/fiee/fonchain-fiee into dev
|
2025-09-22 16:29:45 +08:00 |
|
|
|
8b0ac8df10
|
Merge branch 'feature-tiktok-daiyb' into dev
|
2025-09-22 16:29:44 +08:00 |
|
|
|
8271683614
|
添加信息查询
|
2025-09-22 16:29:38 +08:00 |
|
|
|
e3bc1a992f
|
Merge branch 'feat-sxy-import919' into dev
|
2025-09-22 15:41:19 +08:00 |
|
|
|
be7e522219
|
导入不删除源文件
|
2025-09-22 15:40:52 +08:00 |
|
|
|
971e6f5976
|
Merge branch 'feat-sxy-import919' into dev
|
2025-09-22 13:38:00 +08:00 |
|
|
|
fcb33cc715
|
fiee第二次导入修改
|
2025-09-22 13:37:31 +08:00 |
|
|
|
f9597a2eac
|
Merge branch 'feat-sxy-import919' into dev
|
2025-09-22 11:48:06 +08:00 |
|
|
|
3cb95a8f65
|
fiee第二次空指针修改
|
2025-09-22 11:47:55 +08:00 |
|
|
|
010cf9b126
|
Merge branch 'feat-sxy-import919' into dev
|
2025-09-22 11:42:15 +08:00 |
|
|
|
5dc0b1cbf5
|
fiee第二次导入测试-2
|
2025-09-22 11:42:06 +08:00 |
|
|
|
3b96a4bef8
|
Merge branch 'feat-sxy-import919' into dev
|
2025-09-22 11:40:48 +08:00 |
|
|
|
0f6e0abf33
|
fiee第二次导入测试-1
|
2025-09-22 11:40:27 +08:00 |
|
|
|
7008642797
|
Merge branch 'feat-sxy-import919' into dev
|
2025-09-22 11:29:04 +08:00 |
|
|
|
3d13747ad9
|
fiee第二次导入测试
|
2025-09-22 11:27:29 +08:00 |
|
|
|
7deff19fca
|
Merge branch 'feature-tiktok-daiyb' into dev
|
2025-09-22 10:02:54 +08:00 |
|
|
|
b4dd5d0778
|
完成视频发布
|
2025-09-22 10:02:44 +08:00 |
|
|
|
2784ef0144
|
Merge branch 'jng' into dev
|
2025-09-18 09:36:15 +08:00 |
|
|
|
07a606c59f
|
修改
|
2025-09-18 09:36:08 +08:00 |
|
|
|
6090cf92d6
|
解决冲突
|
2025-09-17 16:52:10 +08:00 |
|
|
|
3ced669383
|
fiee二期迭代
|
2025-09-17 16:50:49 +08:00 |
|
jiaji.H
|
17a017616e
|
Merge branch 'feat-hjj-pkManage#A116' into dev
|
2025-09-11 15:34:23 +08:00 |
|
jiaji.H
|
11c8d62e5e
|
Updata：更新pb文件
|
2025-09-11 15:01:09 +08:00 |
|
|
|
1c3e0b8f52
|
feat 修改头部字段
|
2025-09-10 13:24:06 +08:00 |
|
|
|
9b07b6b973
|
Merge branch 'gy' of https://gitea-net.fontree.cn/fiee/fonchain-fiee into dev
|
2025-09-09 18:51:41 +08:00 |
|
|
|
e85207132f
|
feat 增加一个jwt检验的校验绕过逻辑
|
2025-09-09 18:51:25 +08:00 |
|
|
|
4174a69ad7
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-09-04 18:34:21 +08:00 |
|
|
|
ba7a491f41
|
bugfix:从登录信息获取当前登陆人手机号
|
2025-09-04 18:33:54 +08:00 |
|
|
|
4a97727775
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-09-03 17:59:00 +08:00 |
|
|
|
d54559a997
|
bugfix:从登录信息中获取当前登录人
|
2025-09-03 17:58:33 +08:00 |
|
|
|
7af0704d49
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-09-03 16:26:02 +08:00 |
|
|
|
e1da6bd563
|
feat: 任务管理台功能
新增任务管理台功能
|
2025-09-03 15:52:30 +08:00 |
|
|
|
a5df6f06bf
|
Merge branch 'feature-tiktok-daiyb' into dev
|
2025-09-03 11:48:58 +08:00 |
|
|
|
6d34d7d4f2
|
复制隐私文件
|
2025-09-03 11:48:40 +08:00 |
|
|
|
2b98fefa69
|
Merge branch 'feat-xjj-aschatFunction#A116' into dev
|
2025-09-01 14:23:03 +08:00 |
|
|
|
e2cf0be0cb
|
Update chat.go
|
2025-09-01 14:22:59 +08:00 |
|
|
|
9a9cb3b1f0
|
Merge branch 'feat-xjj-aschatFunction#A116' into dev
|
2025-09-01 14:16:32 +08:00 |
|
|
|
4c602f780f
|
Update handler.go
|
2025-09-01 14:16:28 +08:00 |
|
|
|
1ff87b20da
|
Merge branch 'feat-xjj-aschatFunction#A116' into dev
|
2025-09-01 14:02:35 +08:00 |
|
|
|
39dbc3a9a0
|
Update chatRoom.go
|
2025-09-01 14:02:30 +08:00 |
|
|
|
6d8af40575
|
Merge branch 'feat-xjj-aschatFunction#A116' into dev
|
2025-09-01 13:52:14 +08:00 |
|
|
|
0a69aa8013
|
Update handler.go
|
2025-09-01 13:52:10 +08:00 |
|
|
|
e667837d6a
|
Merge branch 'feat-xjj-aschatFunction#A116'
|
2025-09-01 11:23:50 +08:00 |
|
|
|
5f059c1d7c
|
Merge branch 'feat-xjj-aschatFunction#A116' into dev
|
2025-09-01 11:15:31 +08:00 |
|
|
|
09a4df2b21
|
Update handler.go
|
2025-09-01 11:15:26 +08:00 |
|
|
|
d20cd6d41b
|
Merge branch 'feat-xjj-aschatFunction#A116'
|
2025-09-01 10:03:15 +08:00 |
|
|
|
0e1c8df1ee
|
Update check_login.go
|
2025-08-28 14:45:15 +08:00 |
|
|
|
645770c9fc
|
Update check_login.go
|
2025-08-28 14:08:53 +08:00 |
|
|
|
077f743e54
|
Update check_login.go
|
2025-08-28 11:01:26 +08:00 |
|
|
|
fe9173b872
|
Update check_login.go
|
2025-08-28 10:43:19 +08:00 |
|
|
|
41e28c9aed
|
Merge branch 'jng'
|
2025-08-27 13:59:21 +08:00 |
|
|
|
14956c06de
|
Merge branch 'jng' into dev
|
2025-08-27 11:29:07 +08:00 |
|
|
|
d54a3df245
|
Update reconciliation.go
|
2025-08-27 11:29:01 +08:00 |
|
|
|
a264630b2c
|
Merge branch 'jng' into dev
|
2025-08-27 10:23:59 +08:00 |
|
|
|
e2962353b9
|
更新
|
2025-08-27 10:23:47 +08:00 |
|
|
|
0488918026
|
fix: 解决冲突
|
2025-08-21 14:25:16 +08:00 |
|
|
|
07326e3af8
|
feat: 增加自动回复开关
|
2025-08-21 14:16:51 +08:00 |
|
|
|
c135849195
|
Merge branch 'feature-multicast-daiyb'
|
2025-08-13 09:18:53 +08:00 |
|
|
|
7488f76c08
|
Merge branch 'feat-sxy-import'
|
2025-08-13 09:17:03 +08:00 |
|
|
|
4616d066d8
|
Merge branch 'feat-sxy-import' into dev
|
2025-08-12 17:02:56 +08:00 |
|
|
|
bca6eb9009
|
修改
|
2025-08-12 17:02:32 +08:00 |
|
|
|
8aab8ff4e6
|
更新 pkg/service/upload/upload.go
增加日志
|
2025-08-12 06:03:27 +00:00 |
|
|
|
857b7712ae
|
Merge branch 'jng'
|
2025-08-12 13:35:23 +08:00 |
|
|
|
69bbc5a090
|
Merge branch 'jng' into dev
|
2025-08-12 12:00:21 +08:00 |
|
|
|
adb956dacb
|
update oss config
|
2025-08-12 11:59:31 +08:00 |
|
|
|
db0c064828
|
Merge branch 'feat-sxy-import' into dev
|
2025-08-12 10:25:15 +08:00 |
|
|
|
e7f8993fa5
|
记录时间和uuid
|
2025-08-12 10:24:48 +08:00 |
|
|
|
6773cc62e7
|
Merge branch 'feat-sxy-import' into dev
|
2025-08-11 16:58:47 +08:00 |
|
|
|
eaa48b9d5e
|
过滤特殊数据处理-1
|
2025-08-11 16:58:35 +08:00 |
|
|
|
454d40cfd9
|
Merge branch 'dev' of https://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev
|
2025-08-11 16:42:42 +08:00 |
|
|
|
935dc4bc2c
|
Merge branch 'feat-sxy-import' into dev
|
2025-08-11 16:42:33 +08:00 |
|
|
|
bd59b2dc69
|
过滤特殊数据处理
|
2025-08-11 16:42:13 +08:00 |
|
|
|
b063a38f76
|
Merge branch 'jng'
|
2025-08-11 16:41:50 +08:00 |
|
|
|
2151020f1a
|
解决冲突
|
2025-08-11 16:29:05 +08:00 |
|
|
|
6c4578b8aa
|
update oss config
|
2025-08-11 16:27:26 +08:00 |
|
|
|
d48b6fae1b
|
Merge branch 'feat-sxy-import' into dev
|
2025-08-11 16:08:47 +08:00 |
|
|
|
9bf59916a6
|
修改查询条件
|
2025-08-11 16:08:35 +08:00 |
|
|
|
0e458dc4e7
|
Merge branch 'feat-sxy-import' into dev
|
2025-08-11 15:50:34 +08:00 |
|
|
|
2c49b28d0f
|
修改查询条件
|
2025-08-11 15:50:18 +08:00 |
|
|
|
a8e2e4dfe2
|
Merge branch 'feat-sxy-import' into dev
|
2025-08-11 15:30:09 +08:00 |
|
|
|
3c964140f3
|
导入数据脚本-1
|
2025-08-11 15:29:54 +08:00 |
|
|
|
1a9d6c0ede
|
Merge branch 'feat-sxy-import' into dev
|
2025-08-11 13:30:25 +08:00 |
|
|
|
c20e90d45a
|
导入数据脚本
|
2025-08-11 13:29:49 +08:00 |
|
|
|
11592d8c90
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-08-07 11:59:37 +08:00 |
|
|
|
25eed16be5
|
添加source
|
2025-08-07 11:59:25 +08:00 |
|
|
|
2d7269148a
|
修改symbol-1
|
2025-07-31 14:11:20 +08:00 |
|
|
|
e9d74c99fb
|
修改sec symbol-1
|
2025-07-31 14:11:05 +08:00 |
|
|
|
512bfe4d15
|
修改symbol
|
2025-07-31 13:43:31 +08:00 |
|
|
|
d2ef31f289
|
修改sec symbol
|
2025-07-31 13:42:28 +08:00 |
|
|
|
2ff956bb30
|
fix: map中增加两个新金额
|
2025-07-17 14:23:17 +08:00 |
|
|
|
f672ecf670
|
Merge branch 'sxy-sec'
"x修改symbol"
|
2025-07-16 10:45:46 +08:00 |
|
|
|
a68ba46e51
|
Merge branch 'sxy-sec' into dev
"修改symbol"
|
2025-07-16 10:45:03 +08:00 |
|
|
|
2220a78c19
|
修改官网symbol
|
2025-07-16 10:44:43 +08:00 |
|
|
|
36aaa0a365
|
fix: map中增加两个新金额
|
2025-07-15 10:31:53 +08:00 |
|
|
|
11bc39be1b
|
Merge branch 'jng' into dev
|
2025-07-11 09:40:20 +08:00 |
|
|
|
b86e759146
|
修改
|
2025-07-11 09:39:44 +08:00 |
|
|
|
ac7dd44fd9
|
Merge branch 'jng' into dev
|
2025-07-08 16:21:20 +08:00 |
|
|
|
fa468e0130
|
修改
|
2025-07-08 16:21:06 +08:00 |
|
|
|
403f065486
|
11
|
2025-07-08 16:18:46 +08:00 |
|
|
|
b33a776f93
|
解决冲突
|
2025-07-08 16:14:17 +08:00 |
|
|
|
54326ebe01
|
对账单添加手续费
|
2025-07-08 16:13:30 +08:00 |
|
|
|
80e45457ec
|
Merge branch 'feat-zjy-issue-013' into main
# Conflicts:
# api/bundle/bundle.pb.go
|
2025-07-08 15:21:49 +08:00 |
|
|
|
866cce5bb6
|
Merge branch 'feat-zjy-issue-013' into dev
|
2025-07-08 14:57:25 +08:00 |
|
|
|
6bb22e019a
|
修改
|
2025-07-08 14:57:12 +08:00 |
|
|
|
fe6ac1be55
|
解决冲突
|
2025-07-08 14:20:38 +08:00 |
|
|
|
7d6f141d4e
|
111
|
2025-07-08 14:19:54 +08:00 |
|
|
|
2c2c9499cc
|
Merge branch 'feat-zjy-issue-013' into dev
|
2025-07-08 13:51:40 +08:00 |
|
|
|
f36fadb1bf
|
修改
|
2025-07-08 13:51:27 +08:00 |
|
|
|
b2012fbaba
|
Merge branch 'feat-zjy-issue-013' into dev
|
2025-07-08 13:40:29 +08:00 |
|
|
|
78279cbc82
|
修改
|
2025-07-08 13:40:15 +08:00 |
|
|
|
bc1bdf1fc0
|
Merge branch 'sxy-sec'
"官网sec文件"
|
2025-07-08 13:07:11 +08:00 |
|
|
|
bc9d7fe7ba
|
Merge branch 'sxy-sec' into dev
"修改"
|
2025-07-08 13:03:13 +08:00 |
|
|
|
817c685190
|
修改官网link
|
2025-07-08 13:02:54 +08:00 |
|
|
|
8e4a087310
|
Merge branch 'feat-zjy-issue-013' into dev
|
2025-07-08 11:59:33 +08:00 |
|
|
|
46957da638
|
fix: 提交支持自动创建用户和订单代码- 调整映射map
|
2025-07-08 11:59:13 +08:00 |
|
|
|
e9c46e4a64
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-08 11:52:00 +08:00 |
|
|
|
d55abc66db
|
Merge branch 'feat-zjy-issue-013' into dev
|
2025-07-08 11:51:18 +08:00 |
|
|
|
314891e85b
|
fix: 提交支持自动创建用户和订单代码- 打印日志
|
2025-07-08 11:50:15 +08:00 |
|
|
|
4177a676b9
|
Merge branch 'sxy-sec' into dev
"修改sec"
|
2025-07-08 11:48:49 +08:00 |
|
|
|
c3009b2086
|
修改官网link
|
2025-07-08 11:47:22 +08:00 |
|
|
|
2bc6a4f77c
|
Merge branch 'feat-zjy-issue-013' into dev
|
2025-07-08 11:18:04 +08:00 |
|
|
|
57f10eb7b9
|
fix: 提交支持自动创建用户和订单代码- 调整map
|
2025-07-08 11:17:39 +08:00 |
|
|
|
d8c083f5b6
|
Merge branch 'feat-zjy-issue-013' into dev
|
2025-07-08 10:46:17 +08:00 |
|
|
|
13688ddeb2
|
fix: 提交支持自动创建用户和订单代码-0元购的serial_number调整
|
2025-07-08 10:44:55 +08:00 |
|
|
|
0f1559f1cf
|
Merge branch 'feat-zjy-issue-013' into dev
|
2025-07-08 10:23:58 +08:00 |
|
|
|
e734fadfc6
|
fix: 提交支持自动创建用户和订单代码-子订单初始化的时候是未支付
|
2025-07-08 10:23:08 +08:00 |
|
|
|
d4bc9bae54
|
Merge branch 'feat-zjy-issue-013' into dev
|
2025-07-08 09:46:35 +08:00 |
|
|
|
96e3ddda46
|
修改
|
2025-07-08 09:45:50 +08:00 |
|
|
|
82e5f92be2
|
解决冲突
|
2025-07-07 19:37:04 +08:00 |
|
|
|
493624dfcb
|
添加excel导入
|
2025-07-07 19:35:54 +08:00 |
|
|
|
9f03ac444e
|
合并数据
|
2025-07-07 15:34:00 +08:00 |
|
|
|
f6164cd455
|
fix: 提交支持自动创建用户和订单代码
|
2025-07-07 13:32:19 +08:00 |
|
|
|
173cb0af0f
|
Merge branch 'jng'
|
2025-07-03 16:53:51 +08:00 |
|
|
|
eda4d7dd91
|
Merge branch 'jng' into dev
|
2025-07-03 16:53:33 +08:00 |
|
|
|
d03049762f
|
修改
|
2025-07-03 16:53:08 +08:00 |
|
|
|
f1bb8d54ca
|
Merge branch 'jng'
|
2025-07-03 16:12:17 +08:00 |
|
|
|
b761411203
|
Merge branch 'jng' into dev
|
2025-07-03 16:06:30 +08:00 |
|
|
|
aecd26d08c
|
11
|
2025-07-03 16:05:48 +08:00 |
|
|
|
07309ab587
|
Merge branch 'jng' into dev
|
2025-07-03 16:02:28 +08:00 |
|
