Commit Graph

336 Commits

Author SHA1 Message Date
jiaji.H
4f74232571 Updata:补充代码 2026-01-08 15:59:43 +08:00
jiaji.H
150452f067 Updata:作品确认时增加判断套餐是否过期 2026-01-08 15:57:29 +08:00
jiaji.H
db25e1bd36 Merge branch 'feat-hjj-healthCheck' 2026-01-06 14:04:47 +08:00
jiaji.H
a73f208810 Updata 2026-01-06 14:04:35 +08:00
jiaji.H
2d182775ea Updata:增加健康检测接口 2026-01-06 13:49:23 +08:00
JNG
d3945f920c Merge branch 'jng' 2026-01-06 11:41:41 +08:00
jiaji.H
da7d185455 Updata:解决冲突 2026-01-06 10:14:13 +08:00
JNG
4e9720e14d 添加邮箱和境外手机号 2026-01-04 15:13:45 +08:00
fb77d2560f fix: 增值服务允许刷0 2026-01-04 11:06:33 +08:00
cjy
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
JNG
6644880fc8 解决冲突 2025-12-26 11:47:07 +08:00
JNG
9219289db1 解决冲突 2025-12-26 11:44:06 +08:00
JNG
c58fdff8e2 Update bundleOrder.go 2025-12-26 10:45:01 +08:00
JNG
3aff9c3f87 Update bundleOrder.go 2025-12-26 10:40:42 +08:00
JNG
3bedf23d15 Update bundleOrder.go 2025-12-26 10:25:15 +08:00
JNG
fda10744f1 Update bundleOrder.go 2025-12-26 10:21:04 +08:00
JNG
0c1a9374b4 修改 2025-12-26 09:53:04 +08:00
JNG
2e39896064 Update bundleOrder.go 2025-12-25 20:22:24 +08:00
JNG
21322d0345 Update bundleOrder.go 2025-12-25 20:17:46 +08:00
JNG
07eb527d99 Update bundleOrder.go 2025-12-25 20:14:28 +08:00
JNG
ef8604530d Update signContractV2.go 2025-12-25 20:11:01 +08:00
JNG
804fe0fd33 Update bundleOrder.go 2025-12-25 19:51:20 +08:00
JNG
71bf24ae63 Update signContractV2.go 2025-12-25 19:37:52 +08:00
JNG
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
bd827102e0 Updata:增加导出表对应账号状态 2025-12-25 15:51:18 +08:00
JNG
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
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
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
jiaji.H
ac85e5abf0 Updata:解决冲突 2025-12-17 13:25:45 +08:00
jiaji.H
50ec661b16 Updata:解决冲突 2025-12-17 13:22:31 +08:00
jiaji.H
70ad3b74a1 Updata:修正余量判断 2025-12-17 11:46:55 +08:00
cjy
0a035cfeab fix: 增加日志 2025-12-16 19:45:40 +08:00
cjy
8fedc385c6 fix:增加日志 2025-12-16 19:32:14 +08:00
jiaji.H
8fea74b9e9 Updata:更新样式 2025-12-15 16:13:03 +08:00
jiaji.H
85daee28e7 Updata:修改表格样式 2025-12-15 16:09:00 +08:00
jiaji.H
e3b4dd4b85 Updata:调整导出样式 2025-12-15 16:03:16 +08:00
jiaji.H
7fe45642a7 Updata:修正bug 2025-12-15 15:57:05 +08:00
jiaji.H
caef081ab6 Updata:更新导出字段 2025-12-15 15:49:23 +08:00
JNG
37a27654fe 11 2025-12-15 15:47:17 +08:00
JNG
46860506bc Update bundleOrder.go 2025-12-15 15:44:51 +08:00
jiaji.H
834eb4db1e Updata:增加截止时间打印 2025-12-15 15:41:50 +08:00
JNG
8e0de49db2 Update pay.go 2025-12-15 12:00:23 +08:00
cjy
f5b1cf00e3 fix: 修复自动已读位置 2025-12-11 14:58:59 +08:00
cjy
1e11204947 feat: 增加 h5 确认接口和待确认列表接口 2025-12-09 15:56:41 +08:00