jiaji.H
|
bf4ccd87dd
|
Updata：解决冲突
|
2026-01-05 11:47:07 +08:00 |
|
jiaji.H
|
b52190f021
|
Updata：补充导出数据字段
|
2026-01-05 11:46:02 +08:00 |
|
|
|
b9406c7f8a
|
解决冲突
|
2026-01-04 15:14:51 +08:00 |
|
|
|
4e9720e14d
|
添加邮箱和境外手机号
|
2026-01-04 15:13:45 +08:00 |
|
jiaji.H
|
2a38ed44b0
|
Updata：增加竞品数类型数据
|
2026-01-04 15:04:09 +08:00 |
|
|
|
5b6e72ee96
|
Merge branch 'feat-zjy-fixbug-022' into dev
|
2026-01-04 11:08:32 +08:00 |
|
|
|
fb77d2560f
|
fix: 增值服务允许刷0
|
2026-01-04 11:06:33 +08:00 |
|
|
|
f88e745ab7
|
Merge branch 'feat-cjy-data'
# Conflicts:
# api/aryshare/ayrshare.pb.go
# api/aryshare/ayrshare.validator.pb.go
# api/bundle/bundle.pb.go
# api/bundle/bundle.validator.pb.go
# api/bundle/bundle_triple.pb.go
# api/cast/cast.pb.go
# api/cast/cast.pb.validate.go
# api/cast/cast_triple.pb.go
# pkg/cron/task.go
# pkg/model/cast/work.go
|
2025-12-26 13:28:55 +08:00 |
|
|
|
e8fb81bfe9
|
fiee三期
|
2025-12-26 11:53:38 +08:00 |
|
|
|
6644880fc8
|
解决冲突
|
2025-12-26 11:47:07 +08:00 |
|
|
|
9219289db1
|
解决冲突
|
2025-12-26 11:44:06 +08:00 |
|
|
|
792a07057c
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-26 10:45:07 +08:00 |
|
|
|
c58fdff8e2
|
Update bundleOrder.go
|
2025-12-26 10:45:01 +08:00 |
|
|
|
f017aaa32e
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-26 10:40:51 +08:00 |
|
|
|
3aff9c3f87
|
Update bundleOrder.go
|
2025-12-26 10:40:42 +08:00 |
|
|
|
77c71b135d
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-26 10:25:20 +08:00 |
|
|
|
3bedf23d15
|
Update bundleOrder.go
|
2025-12-26 10:25:15 +08:00 |
|
|
|
2c0cc0a075
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-26 10:21:09 +08:00 |
|
|
|
fda10744f1
|
Update bundleOrder.go
|
2025-12-26 10:21:04 +08:00 |
|
|
|
37e05c5e70
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-26 09:53:18 +08:00 |
|
|
|
0c1a9374b4
|
修改
|
2025-12-26 09:53:04 +08:00 |
|
|
|
4494e80665
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-25 20:22:31 +08:00 |
|
|
|
2e39896064
|
Update bundleOrder.go
|
2025-12-25 20:22:24 +08:00 |
|
|
|
4587bcb73c
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-25 20:17:53 +08:00 |
|
|
|
21322d0345
|
Update bundleOrder.go
|
2025-12-25 20:17:46 +08:00 |
|
|
|
b8258c611f
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-25 20:14:35 +08:00 |
|
|
|
07eb527d99
|
Update bundleOrder.go
|
2025-12-25 20:14:28 +08:00 |
|
|
|
384d67f56d
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-25 20:11:06 +08:00 |
|
|
|
ef8604530d
|
Update signContractV2.go
|
2025-12-25 20:11:01 +08:00 |
|
|
|
1a4d3224a1
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-25 19:51:26 +08:00 |
|
|
|
804fe0fd33
|
Update bundleOrder.go
|
2025-12-25 19:51:20 +08:00 |
|
|
|
5e17ed3890
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-25 19:38:00 +08:00 |
|
|
|
71bf24ae63
|
Update signContractV2.go
|
2025-12-25 19:37:52 +08:00 |
|
|
|
943a3f58b7
|
解决冲突
|
2025-12-25 18:46:16 +08:00 |
|
|
|
f1372dfe5a
|
修改合同签署
|
2025-12-25 18:45:37 +08:00 |
|
jiaji.H
|
885dac4abc
|
Merge branch 'feat-hjj-ExportManager'
|
2025-12-25 15:58:14 +08:00 |
|
jiaji.H
|
6e64748577
|
Updata：解决冲突
|
2025-12-25 15:53:37 +08:00 |
|
jiaji.H
|
bd827102e0
|
Updata：增加导出表对应账号状态
|
2025-12-25 15:51:18 +08:00 |
|
|
|
13cdbebace
|
Merge branch 'jng-1127'
|
2025-12-25 11:47:26 +08:00 |
|
|
|
89f0ceaca0
|
Merge branch 'main' into feature-userinfo-daiyb
|
2025-12-24 15:59:57 +08:00 |
|
jiaji.H
|
d8aeacb3a8
|
Merge branch 'feat-hjj-ExportManager' into dev
|
2025-12-23 16:57:03 +08:00 |
|
jiaji.H
|
b5aa103a8f
|
Updata:修改导出名称
|
2025-12-23 16:56:50 +08:00 |
|
|
|
f8f937bf80
|
Update msg.go
|
2025-12-18 20:37:06 +08:00 |
|
|
|
985a39a75e
|
Update msg.go
|
2025-12-18 20:36:50 +08:00 |
|
jiaji.H
|
1e19761356
|
Updata：增加失败类型
|
2025-12-18 19:25:21 +08:00 |
|
jiaji.H
|
2ebfe14652
|
Merge branch 'feat-hjj-BundleStratusInfo' into dev
|
2025-12-18 17:36:30 +08:00 |
|
jiaji.H
|
6cd2077886
|
Updata：增加套餐过期判断
|
2025-12-18 17:36:09 +08:00 |
|
jiaji.H
|
c2b4114bd5
|
Updata：解决冲突
|
2025-12-17 16:24:53 +08:00 |
|
jiaji.H
|
9477939a5a
|
Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask'
|
2025-12-17 16:21:16 +08:00 |
|
jiaji.H
|
ccf51138e3
|
Updata：更新逻辑
|
2025-12-17 16:21:03 +08:00 |
|
