Commit Graph

1461 Commits

Author SHA1 Message Date
JNG
d11a7a5c6a 解决冲突 2025-12-26 11:43:26 +08:00
JNG
edc85ae53e 解决冲突 2025-12-26 11:42:47 +08:00
cjy
7bc24961bf Merge branch 'fix-cjy-workNum' into dev 2025-12-26 09:52:57 +08:00
JNG
c3873e0e3e Merge branch 'jng-contract-1225' into dev 2025-12-25 18:59:09 +08:00
JNG
10f336ec66 11 2025-12-25 18:59:03 +08:00
JNG
ad78d51967 Merge branch 'jng-contract-1225' into dev 2025-12-25 18:55:15 +08:00
JNG
fb77431848 Update bundle_order_records.go 2025-12-25 18:55:08 +08:00
JNG
b370a69b02 Merge branch 'jng-contract-1225' into dev 2025-12-25 18:50:53 +08:00
JNG
88ea6356c0 Update mysql.go 2025-12-25 18:50:46 +08:00
JNG
bfffc58e16 解决冲突 2025-12-25 18:45:09 +08:00
JNG
fa640ed8ef 修改合同签署 2025-12-25 18:44:43 +08:00
cjy
bfaac2fd95 fix: 修复统计视频和图文以及数据分析统计 2025-12-25 16:51:36 +08:00
jiaji.H
e6bb72da9f Updata:解决冲突 2025-12-25 16:44:40 +08:00
jiaji.H
5dd3eb98c4 Updata:修改判断 2025-12-25 16:43:57 +08:00
jiaji.H
24980bd23f Updata:解决冲突 2025-12-25 16:27:26 +08:00
jiaji.H
a526c9e837 Updata:解决冲突 2025-12-25 15:52:51 +08:00
jiaji.H
296e6a3eff Updata:更新pb文件 2025-12-25 15:51:38 +08:00
jiaji.H
28b6e6a514 Updata:解决冲突 2025-12-25 15:40:27 +08:00
jiaji.H
31093ace3f Updata:更新导出艺人账号字段 2025-12-25 15:39:41 +08:00
jiaji.H
71e0b4e323 Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' 2025-12-24 12:30:25 +08:00
jiaji.H
5e428f6acc Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' into dev 2025-12-24 12:02:10 +08:00
jiaji.H
2c9cf80f6c Updata更新检测sql 2025-12-24 12:01:55 +08:00
jiaji.H
41c534d7d5 Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' into dev 2025-12-24 11:54:29 +08:00
jiaji.H
1d871c909b Updata:增加log 2025-12-24 11:54:19 +08:00
jiaji.H
e4f7529c0c Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' 2025-12-19 13:55:59 +08:00
jiaji.H
d85409c1c8 Updata:修改成根据待确认时间来判断 2025-12-19 13:55:42 +08:00
jiaji.H
512c3683ef Updata:解决冲突 2025-12-18 17:26:22 +08:00
jiaji.H
da925cc342 Updata:增加套餐状态 2025-12-18 17:24:56 +08:00
jiaji.H
850df59ab0 Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' 2025-12-18 15:15:13 +08:00
jiaji.H
97ac650055 Updata:更新获取数据条件 2025-12-18 15:15:01 +08:00
jiaji.H
8127a14106 Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' 2025-12-18 14:29:07 +08:00
jiaji.H
f12da7b70a Updata:更新随机确认时间 2025-12-18 14:28:30 +08:00
jiaji.H
d4cacd0996 Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' 2025-12-18 10:36:50 +08:00
jiaji.H
55dbf93c73 Updata:回退至正常时间 2025-12-18 10:36:38 +08:00
jiaji.H
c4e8d33c6d Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' 2025-12-18 10:22:30 +08:00
jiaji.H
69ac59610a Updata:调整检查时间和数量 2025-12-18 10:22:09 +08:00
jiaji.H
c5e9c42ffd Updata:更新逻辑 2025-12-17 16:24:02 +08:00
jiaji.H
387293b15a Updata:解决冲突 2025-12-17 16:17:25 +08:00
jiaji.H
c5b63de30a Updata:更新sql 2025-12-17 16:16:41 +08:00
jiaji.H
8801a2c551 Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' 2025-12-17 14:04:09 +08:00
jiaji.H
f1850a68d7 Updata:调整数据选择 2025-12-17 14:03:52 +08:00
jiaji.H
78faedd3d5 Updata:解决冲突 2025-12-17 13:24:54 +08:00
jiaji.H
7d686338e0 Updata:解决冲突 2025-12-17 13:21:24 +08:00
jiaji.H
7d758b1b89 Updata:解决冲突 2025-12-17 10:59:44 +08:00
jiaji.H
065ac39c05 Updata:增加字段 2025-12-17 10:58:36 +08:00
jiaji.H
ccda7aab75 Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' into dev 2025-12-17 09:06:12 +08:00
jiaji.H
2804ffd294 Updata:更新只拿取24小时内的数据 2025-12-17 09:03:54 +08:00
jiaji.H
0ad0b78e0a Merge branch 'feat-hjj-AutoManuallyConfirmWorkTask' into dev 2025-12-16 16:02:53 +08:00
jiaji.H
b345333255 Updata:补充代码 2025-12-16 16:02:38 +08:00
jiaji.H
bb5a8a9547 Updata:增加获取待确认列表 2025-12-16 16:01:30 +08:00