Commit Graph

474 Commits

Author SHA1 Message Date
jiaji.H
d53eee5f9e Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' into dev 2025-12-17 11:48:37 +08:00
jiaji.H
70ad3b74a1 Updata:修正余量判断 2025-12-17 11:46:55 +08:00
cjy
f954df6bd6 Merge branch 'feat-cjy-data' into dev 2025-12-16 19:45:55 +08:00
cjy
0a035cfeab fix: 增加日志 2025-12-16 19:45:40 +08:00
cjy
e481f61a53 Merge branch 'feat-cjy-data' into dev
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2025-12-16 19:33:48 +08:00
cjy
8fedc385c6 fix:增加日志 2025-12-16 19:32:14 +08:00
jiaji.H
d958a9e100 Merge branch 'feat-hjj-CastWork#' into dev 2025-12-15 16:13:13 +08:00
jiaji.H
8fea74b9e9 Updata:更新样式 2025-12-15 16:13:03 +08:00
jiaji.H
8fc0336932 Merge branch 'feat-hjj-CastWork#' into dev 2025-12-15 16:09:13 +08:00
jiaji.H
85daee28e7 Updata:修改表格样式 2025-12-15 16:09:00 +08:00
jiaji.H
9f808bbcd4 Merge branch 'feat-hjj-CastWork#' into dev 2025-12-15 16:03:30 +08:00
jiaji.H
e3b4dd4b85 Updata:调整导出样式 2025-12-15 16:03:16 +08:00
jiaji.H
bd1b57ddb2 Merge branch 'feat-hjj-CastWork#' into dev 2025-12-15 15:57:27 +08:00
jiaji.H
7fe45642a7 Updata:修正bug 2025-12-15 15:57:05 +08:00
jiaji.H
3f81b11945 Merge branch 'feat-hjj-CastWork#' into dev 2025-12-15 15:49:43 +08:00
jiaji.H
caef081ab6 Updata:更新导出字段 2025-12-15 15:49:23 +08:00
JNG
3672dc876a Merge branch 'jng' into dev 2025-12-15 15:44:59 +08:00
JNG
46860506bc Update bundleOrder.go 2025-12-15 15:44:51 +08:00
jiaji.H
6223a476b1 Merge branch 'feat-hjj-CastWork#' into dev 2025-12-15 15:42:00 +08:00
jiaji.H
834eb4db1e Updata:增加截止时间打印 2025-12-15 15:41:50 +08:00
JNG
80da315d7b Merge branch 'jng-1127' into dev 2025-12-15 12:00:30 +08:00
JNG
8e0de49db2 Update pay.go 2025-12-15 12:00:23 +08:00
cjy
4e658732da Merge branch 'feat-cjy-data' into dev 2025-12-11 15:00:59 +08:00
cjy
f5b1cf00e3 fix: 修复自动已读位置 2025-12-11 14:58:59 +08:00
cjy
137829c50a Merge branch 'feat-cjy-data' into dev 2025-12-09 15:58:05 +08:00
cjy
1e11204947 feat: 增加 h5 确认接口和待确认列表接口 2025-12-09 15:56:41 +08:00
jiaji.H
7708e5c9a4 Updata:更新pb文件,修改导出表格格式 2025-12-09 13:36:17 +08:00
jiaji.H
a2aebf7cc6 Updata:更新pb文件和导出表格格式 2025-12-09 13:34:17 +08:00
JNG
39235ebc3c 解决冲突 2025-12-09 11:12:33 +08:00
JNG
3360808e3c 11 2025-12-09 11:12:08 +08:00
jiaji.H
9027c81697 Updata:解决冲突 2025-12-08 09:27:57 +08:00
jiaji.H
469fac745d Merge branch 'feat-hjj-filebrowser#Saas3' into dev 2025-12-01 13:56:08 +08:00
jiaji.H
9f2ff6a440 Updata:更新素材库错误推送 2025-12-01 13:55:58 +08:00
jiaji.H
6b8b993ceb Updata:解决冲突 2025-12-01 11:46:51 +08:00
jiaji.H
488eee0e9b Updata 2025-11-28 15:00:58 +08:00
jiaji.H
1a7cd0e135 Merge branch 'feat-hjj-CastWork#' into dev 2025-11-28 14:45:36 +08:00
jiaji.H
b86381b0b7 Updata更新列宽 2025-11-28 14:45:22 +08:00
jiaji.H
e37a2fe3db Merge branch 'feat-hjj-CastWork#' into dev 2025-11-28 14:38:25 +08:00
jiaji.H
f3fd2ddcac Updata:调整艺人账号导出列表 2025-11-28 14:37:48 +08:00
jiaji.H
47500a2028 Merge branch 'feat-hjj-CastWork#' into dev 2025-11-27 17:59:04 +08:00
jiaji.H
b20b2c4e3f Updata:调整错误提示 2025-11-27 17:58:54 +08:00
jiaji.H
540aeb23ea Updata:支持多语言信息返回 2025-11-26 13:46:12 +08:00
jiaji.H
1f4f24f9ef Updata:解决冲突 2025-11-26 13:26:15 +08:00
jiaji.H
049c0cfef0 Updata:更新错误信息 2025-11-26 13:23:30 +08:00
jiaji.H
1ae5d89d29 Merge branch 'feat-hjj-CastWork#' into dev 2025-11-26 11:47:35 +08:00
jiaji.H
5ba9a06fc1 Updata:更新接口错误返回 2025-11-26 11:47:25 +08:00
jiaji.H
4b21bfd759 Merge branch 'feat-hjj-CastWork#' into dev 2025-11-26 11:42:53 +08:00
jiaji.H
63a58f4482 Updata:更新接口错误返回 2025-11-26 11:41:05 +08:00
jiaji.H
3cec6a41bf Updata:解决冲突 2025-11-24 12:00:53 +08:00
jiaji.H
68c7b8746d Updata:更新数据导出文件名称 2025-11-21 15:28:06 +08:00