|
|
151abc145b
|
fix: 调整创建订单的uuid
|
2026-02-04 13:08:18 +08:00 |
|
|
|
a822149b30
|
Merge branch 'feat-zjy-fixbug-033' into dev
# Conflicts:
# internal/logic/orderRecordsLogic.go
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle.validator.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-02-04 12:17:23 +08:00 |
|
|
|
2155d56187
|
fix: 调整创建订单的uuid
|
2026-02-04 12:13:00 +08:00 |
|
|
|
ac9bee2a83
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-02-04 11:26:46 +08:00 |
|
|
|
6ef896b009
|
fix: rizhi
|
2026-02-04 11:26:30 +08:00 |
|
jiaji.H
|
c500eeec84
|
Updata:解决冲突
|
2026-02-04 11:16:38 +08:00 |
|
jiaji.H
|
36a134a1e8
|
Updata：增加是否续费
|
2026-02-04 11:15:19 +08:00 |
|
jiaji.H
|
ef3dd698e5
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-04 10:46:45 +08:00 |
|
jiaji.H
|
deaac40fad
|
Updata：更新发票时间检索
|
2026-02-04 10:46:38 +08:00 |
|
jiaji.H
|
3dac79736b
|
Updata：解决冲突
|
2026-02-04 10:26:37 +08:00 |
|
jiaji.H
|
013c14b9f7
|
Updata：增加获取最新发票编辑号接口
|
2026-02-04 10:18:50 +08:00 |
|
jiaji.H
|
fe4357f246
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-04 09:48:32 +08:00 |
|
jiaji.H
|
18e341edce
|
Updata：更新时间排序
|
2026-02-04 09:48:07 +08:00 |
|
|
|
cde554ecbd
|
Merge branch 'feat-cjy-customerContract'
# Conflicts:
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle.validator.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-02-04 09:40:22 +08:00 |
|
|
|
01753b9735
|
Merge branch 'jng' into dev
|
2026-02-03 16:46:46 +08:00 |
|
|
|
4f3fcb8206
|
修改
|
2026-02-03 16:46:33 +08:00 |
|
jiaji.H
|
90362ac91e
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 16:04:32 +08:00 |
|
jiaji.H
|
d9b425bba1
|
Updata：增加不太类型时间格式兼容
|
2026-02-03 16:04:23 +08:00 |
|
jiaji.H
|
e5ced3709e
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 15:44:25 +08:00 |
|
jiaji.H
|
275ee0376f
|
Updata：更新sql
|
2026-02-03 15:44:10 +08:00 |
|
jiaji.H
|
1bfe928434
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 15:00:40 +08:00 |
|
jiaji.H
|
be45f91971
|
Updata：修改时间解析
|
2026-02-03 15:00:32 +08:00 |
|
jiaji.H
|
8e4fd35b8d
|
Updata：解决冲突
|
2026-02-03 14:30:54 +08:00 |
|
jiaji.H
|
c149bc1af5
|
Updata：更新时间解析
|
2026-02-03 14:30:26 +08:00 |
|
jiaji.H
|
0c0ec5f61d
|
Updata：增加log
|
2026-02-03 14:13:04 +08:00 |
|
jiaji.H
|
7df8cfa8cb
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 13:59:56 +08:00 |
|
jiaji.H
|
b8dcfafe7e
|
Updata：列表倒叙排序
|
2026-02-03 13:59:49 +08:00 |
|
jiaji.H
|
98ab8f5ffb
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 13:18:01 +08:00 |
|
jiaji.H
|
24423900d3
|
Updata:更新检索sql
|
2026-02-03 13:17:48 +08:00 |
|
jiaji.H
|
455d09f14a
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 13:11:22 +08:00 |
|
jiaji.H
|
40bd33d19c
|
Updata:修正sql
|
2026-02-03 13:11:14 +08:00 |
|
|
|
aa772f6590
|
解决冲突
|
2026-02-03 10:19:01 +08:00 |
|
|
|
fa43fadae2
|
添加竞品数
|
2026-02-03 10:18:40 +08:00 |
|
|
|
eee821c4cb
|
11
|
2026-02-03 10:01:36 +08:00 |
|
jiaji.H
|
14d0465e6d
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 09:26:41 +08:00 |
|
jiaji.H
|
420a169c65
|
Updata：完善检索逻辑
|
2026-02-03 09:26:26 +08:00 |
|
jiaji.H
|
83d682b8af
|
Updata:解决冲突
|
2026-02-02 20:44:52 +08:00 |
|
jiaji.H
|
dfd82b87b8
|
Updata：更新log
|
2026-02-02 20:43:49 +08:00 |
|
jiaji.H
|
34fbe7a3d9
|
Updata：增加log
|
2026-02-02 20:30:33 +08:00 |
|
jiaji.H
|
e53e2963a6
|
Updata：增加数据打印
|
2026-02-02 20:30:03 +08:00 |
|
jiaji.H
|
3bfd1007ee
|
Updata：解决冲突
|
2026-02-02 20:02:35 +08:00 |
|
jiaji.H
|
c348409a73
|
Updata：更新数据创建
|
2026-02-02 20:00:28 +08:00 |
|
jiaji.H
|
171d6b04d3
|
Updata：解决冲突
|
2026-02-02 19:46:18 +08:00 |
|
jiaji.H
|
1f8fb4abf8
|
Updata：增加打印
|
2026-02-02 19:45:51 +08:00 |
|
jiaji.H
|
88309279aa
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-02 18:01:51 +08:00 |
|
jiaji.H
|
7276a7d24e
|
Updata：修改发票相关信息查询
|
2026-02-02 18:01:43 +08:00 |
|
|
|
57bfb779bd
|
Merge branch 'jng' into dev
|
2026-02-02 17:54:30 +08:00 |
|
|
|
48e5d51373
|
Update bundleExtend.go
|
2026-02-02 17:54:24 +08:00 |
|
|
|
83a309152e
|
Merge branch 'jng' into dev
|
2026-02-02 17:32:07 +08:00 |
|
|
|
0c8631e775
|
Update bundleExtend.go
|
2026-02-02 17:32:01 +08:00 |
|
|
|
8bea38c983
|
Merge branch 'jng' into dev
|
2026-02-02 16:55:51 +08:00 |
|
|
|
bbc0b97b30
|
Update bundleExtend.go
|
2026-02-02 16:55:45 +08:00 |
|
jiaji.H
|
5d9592b3e3
|
Updata：解决冲突
|
2026-02-02 16:45:45 +08:00 |
|
jiaji.H
|
01cb67feda
|
Updata：更新字段
|
2026-02-02 16:36:59 +08:00 |
|
jiaji.H
|
66bffabfa0
|
Updata：解决冲突
|
2026-02-02 15:39:21 +08:00 |
|
jiaji.H
|
2b23495bce
|
Updata：更新脚本导出字段
|
2026-02-02 15:38:45 +08:00 |
|
jiaji.H
|
1ffdb284ec
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-02 15:24:56 +08:00 |
|
jiaji.H
|
574fa6e3e6
|
Updata：增加区号
|
2026-02-02 15:24:32 +08:00 |
|
jiaji.H
|
a46add94a4
|
Updata：解决冲突
|
2026-02-02 14:13:11 +08:00 |
|
jiaji.H
|
2cf1b946d0
|
Updata:更新字段
|
2026-02-02 14:09:27 +08:00 |
|
jiaji.H
|
6b1f03a42a
|
Updata：解决冲突
|
2026-02-02 13:42:44 +08:00 |
|
jiaji.H
|
8db49c0db9
|
Updata：增加字段
|
2026-02-02 13:39:09 +08:00 |
|
jiaji.H
|
1a8d5b1bd4
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-02 11:25:48 +08:00 |
|
jiaji.H
|
28add54ce9
|
Updata：增加状态更新
|
2026-02-02 11:25:38 +08:00 |
|
jiaji.H
|
6b7df996a3
|
Updata：解决冲突
|
2026-02-02 11:21:23 +08:00 |
|
jiaji.H
|
1389a4ad94
|
Updata：修改数据结构
|
2026-02-02 11:14:50 +08:00 |
|
jiaji.H
|
0a273e7e32
|
Updata：增加H5获取用户发票列表
|
2026-02-02 10:56:54 +08:00 |
|
|
|
6500d35013
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-02-02 10:44:15 +08:00 |
|
|
|
13b077c172
|
fix:修复重复创建的问题
|
2026-02-02 10:44:07 +08:00 |
|
|
|
dcfe12ba09
|
Merge branch 'fix-cjy-main' into dev
# Conflicts:
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle.validator.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-02-02 10:21:31 +08:00 |
|
|
|
874dc6b720
|
Merge branch 'jng' into dev
|
2026-02-02 09:58:46 +08:00 |
|
|
|
e7fff341ca
|
Update orderRecordsDao.go
|
2026-02-02 09:58:39 +08:00 |
|
jiaji.H
|
80555657dc
|
Updata：修正精度丢失
|
2026-01-31 00:03:55 +08:00 |
|
jiaji.H
|
a9e1730402
|
Upload：更新统计
|
2026-01-30 23:14:37 +08:00 |
|
jiaji.H
|
9760aab1bb
|
Updata更新sql
|
2026-01-30 22:35:30 +08:00 |
|
jiaji.H
|
1bddcbef56
|
Updata：修正查询sql
|
2026-01-30 21:35:35 +08:00 |
|
|
|
7581a337a7
|
解决冲突
|
2026-01-30 15:42:37 +08:00 |
|
|
|
d74cc74369
|
Merge branch 'feat-cjy-customerContract' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-01-30 15:31:53 +08:00 |
|
|
|
c57b60230b
|
feat: 增加推荐人列表
|
2026-01-30 15:30:57 +08:00 |
|
jiaji.H
|
6ac8b2b1b4
|
Updata:解决冲突
|
2026-01-30 15:18:47 +08:00 |
|
|
|
84dacc72ce
|
添加购买类型字段
|
2026-01-30 14:26:28 +08:00 |
|
jiaji.H
|
63ccfb5c90
|
Updata:解决冲突
|
2026-01-30 12:42:08 +08:00 |
|
|
|
321d7483a5
|
Merge branch 'feat-cjy-customerContract' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-01-30 11:43:31 +08:00 |
|
jiaji.H
|
ca02baa840
|
Updata:增加导出发布作品数据临时接口
|
2026-01-30 11:39:18 +08:00 |
|
jiaji.H
|
d01f325ed4
|
Updata：增加接口数据字段
|
2026-01-30 11:16:21 +08:00 |
|
|
|
83b4e13457
|
feat：增加校验
|
2026-01-30 10:42:52 +08:00 |
|
|
|
a903157725
|
feat：增加合同管理接口
|
2026-01-30 09:33:52 +08:00 |
|
jiaji.H
|
d282c1d1f2
|
Updata：增加发票编号字段
|
2026-01-29 11:10:54 +08:00 |
|
|
|
8c171a2416
|
feat:增加客户管理相关接口
|
2026-01-29 09:51:43 +08:00 |
|
jiaji.H
|
b89f41fd6f
|
Updata:更新字段
|
2026-01-28 16:37:10 +08:00 |
|
jiaji.H
|
e73aabf106
|
Updata:增加发票管理模块
|
2026-01-28 13:45:59 +08:00 |
|
jiaji.H
|
43678aa882
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-27 13:29:06 +08:00 |
|
jiaji.H
|
8c0f2eabcf
|
Updata：修正计数bug
|
2026-01-27 13:28:51 +08:00 |
|
jiaji.H
|
4d5d4e3608
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-21 14:48:36 +08:00 |
|
jiaji.H
|
f924c003eb
|
Updata：修正扩展信息
|
2026-01-21 14:48:26 +08:00 |
|
|
|
d2b6ac8f7f
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-21 10:35:16 +08:00 |
|
|
|
c87f1defa9
|
移除dao层没用代码
|
2026-01-21 10:32:38 +08:00 |
|
|
|
e1702d7b46
|
把所有请求参数放到dto文件
|
2026-01-21 10:26:49 +08:00 |
|
|
|
26044470f0
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-21 10:11:45 +08:00 |
|
|
|
4d8203bf8c
|
增加 dto 用来放请求参数
|
2026-01-21 10:11:36 +08:00 |
|
|
|
eb6a6363ef
|
Merge branch 'feat-hjj-Competitors#A203' into dev
# Conflicts:
# pkg/cron/cron.go
|
2026-01-21 10:02:08 +08:00 |
|
|
|
2a75c3eb78
|
移除没用的代码
|
2026-01-20 17:30:54 +08:00 |
|
jiaji.H
|
d00bb4ddbc
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-20 15:05:30 +08:00 |
|
jiaji.H
|
278606b5e7
|
Updata：修改季度发放余量逻辑
|
2026-01-20 15:05:19 +08:00 |
|
jiaji.H
|
d4d4e262f7
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-19 13:20:13 +08:00 |
|
jiaji.H
|
cd261657fd
|
Updata：增加竞品数异常发布统计
|
2026-01-19 13:20:03 +08:00 |
|
jiaji.H
|
bd8bd41a2c
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-19 09:37:46 +08:00 |
|
jiaji.H
|
54296dd70a
|
Updata：修改手动扩展计费类型
|
2026-01-19 09:36:15 +08:00 |
|
jiaji.H
|
e170a086af
|
Updata：修正sql
|
2026-01-16 11:42:01 +08:00 |
|
jiaji.H
|
899c20d6c3
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-15 13:19:42 +08:00 |
|
jiaji.H
|
cbe50785c3
|
Fix:修正sql
|
2026-01-15 13:19:24 +08:00 |
|
jiaji.H
|
70a99bdf14
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-15 13:16:08 +08:00 |
|
jiaji.H
|
bf4aa92713
|
fix：修正sql
|
2026-01-15 13:15:57 +08:00 |
|
jiaji.H
|
0ff38110f4
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-15 13:11:24 +08:00 |
|
jiaji.H
|
c4571c8bef
|
Updata：更新sql
|
2026-01-15 13:11:11 +08:00 |
|
jiaji.H
|
ff08d4618e
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-15 11:47:34 +08:00 |
|
jiaji.H
|
a89e39abc5
|
Updata：修正sql
|
2026-01-15 11:47:17 +08:00 |
|
jiaji.H
|
e9d6bf458a
|
Updata：解决冲突
|
2026-01-15 11:32:11 +08:00 |
|
jiaji.H
|
508f714dae
|
Updata:增加竞品数数据指标
|
2026-01-15 11:08:32 +08:00 |
|
jiaji.H
|
3abd57aa9a
|
Updata：解决冲突
|
2026-01-14 13:33:23 +08:00 |
|
jiaji.H
|
c0bfd322a8
|
Merge branch 'feat-hjj-ExportManager'
|
2026-01-14 09:22:06 +08:00 |
|
jiaji.H
|
e9bef82968
|
Updata：更新sql
|
2026-01-14 09:21:51 +08:00 |
|
jiaji.H
|
445695ef29
|
Merge branch 'feat-hjj-ExportManager' into dev
|
2026-01-14 09:16:55 +08:00 |
|
jiaji.H
|
aae7aa077b
|
Updata：更新sql
|
2026-01-14 09:16:34 +08:00 |
|
jiaji.H
|
e4a8968a4c
|
Merge branch 'feat-hjj-ExportManager' into dev
|
2026-01-14 09:12:28 +08:00 |
|
jiaji.H
|
61e5a69484
|
Updata：更新sql
|
2026-01-14 09:12:17 +08:00 |
|
jiaji.H
|
5a91f8bd14
|
Merge branch 'feat-hjj-ExportManager' into dev
|
2026-01-14 09:08:25 +08:00 |
|
jiaji.H
|
0524d503f3
|
Updata：增加套餐过期过虑
|
2026-01-14 09:08:06 +08:00 |
|
jiaji.H
|
36a751b8ac
|
Updata：解决冲突
|
2026-01-13 16:39:08 +08:00 |
|
jiaji.H
|
c92d48862a
|
Merge branch 'feat-hjj-ExportManager' into dev
|
2026-01-13 14:44:33 +08:00 |
|
jiaji.H
|
7f5384c935
|
fix：修正bug
|
2026-01-13 14:44:18 +08:00 |
|
jiaji.H
|
ea7b94baf0
|
Updata：解决冲突
|
2026-01-13 14:13:54 +08:00 |
|
jiaji.H
|
137e752c1b
|
Updata：导出支持选择多个月份进行导出
|
2026-01-13 13:50:58 +08:00 |
|
jiaji.H
|
94258657e7
|
Updata：解决冲突
|
2026-01-13 09:43:01 +08:00 |
|
jiaji.H
|
debb225291
|
Updata：解决冲突
|
2026-01-13 09:38:41 +08:00 |
|
|
|
8b85aeee28
|
11
|
2026-01-12 18:08:45 +08:00 |
|
jiaji.H
|
6433b28072
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-12 15:12:07 +08:00 |
|
jiaji.H
|
8536070eea
|
Updata：增加每月季度发放竞品数函数
|
2026-01-12 15:07:23 +08:00 |
|
|
|
25d37da088
|
解决冲突
|
2026-01-12 14:38:06 +08:00 |
|
|
|
bbe0c0390c
|
11
|
2026-01-12 14:36:20 +08:00 |
|
jiaji.H
|
bf41622eab
|
Updata：更新创建每月数据的时间
|
2026-01-09 16:48:33 +08:00 |
|
jiaji.H
|
7ac61c197c
|
Updata：解决冲突
|
2026-01-09 13:16:28 +08:00 |
|
jiaji.H
|
b8aa941f75
|
Updata：解决冲突
|
2026-01-09 11:36:44 +08:00 |
|
jiaji.H
|
e5baa91e9d
|
Updata：增加youtube和bluesky账号数据导出
|
2026-01-09 11:23:53 +08:00 |
|
|
|
3584a9f948
|
Merge branch 'fix-cjy-workNum'
|
2026-01-07 13:22:47 +08:00 |
|
|
|
4f01d924d6
|
fix:过滤user表和real_name 表软删除的记录
# Conflicts:
# internal/dao/taskDao.go
|
2026-01-07 13:11:17 +08:00 |
|
|
|
fc25533193
|
fix:过滤user表和real_name 表软删除的记录
# Conflicts:
# internal/dao/taskDao.go
|
2026-01-07 13:10:56 +08:00 |
|
|
|
fa79376e51
|
Merge branch 'feat-zjy-fixbug-023' into dev
# Conflicts:
# internal/dao/bundleExtend.go
|
2026-01-07 10:53:29 +08:00 |
|
|
|
71f7be5716
|
fix: 支付回调，更新手续费
|
2026-01-07 10:50:51 +08:00 |
|
jiaji.H
|
a795b5b491
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-05 13:47:38 +08:00 |
|
