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
|
23ea832e31
|
Merge branch 'feat-hjj-BundleOrderInvoice#A225' into dev
|
2026-02-03 13:26:31 +08:00 |
|
jiaji.H
|
c25d7dbdb0
|
Updata：更新字段类型
|
2026-02-03 13:26:23 +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 |
|
|
|
a92d70179e
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-02-03 10:46:04 +08:00 |
|
|
|
adbe0abb2a
|
fix:移除一些无用注释
|
2026-02-03 10:45:53 +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
|
ae95c7dd4a
|
Updata：增加字段
|
2026-02-02 19:40:10 +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
|
01e488555f
|
Updata：增加区号字段
|
2026-02-02 15:22:21 +08:00 |
|
jiaji.H
|
111adcbcd9
|
Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/micro-bundle into dev
|
2026-02-02 14:13:16 +08:00 |
|
jiaji.H
|
a46add94a4
|
Updata：解决冲突
|
2026-02-02 14:13:11 +08:00 |
|
|
|
aef6696a70
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-02-02 14:09:35 +08:00 |
|
jiaji.H
|
2cf1b946d0
|
Updata:更新字段
|
2026-02-02 14:09:27 +08:00 |
|
|
|
99d05a503a
|
fix：最近更新时间精度精确到分钟
|
2026-02-02 14:09:24 +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 |
|
|
|
bf8bd3b9eb
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-02-02 11:44:45 +08:00 |
|
|
|
c7ee97adcb
|
fix：过滤掉周期为 -1的周期
|
2026-02-02 11:44:37 +08:00 |
|
|
|
c3a721d343
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-02-02 11:29:18 +08:00 |
|
|
|
2db9a511ed
|
fix：子表的支付周期和开发周期只少有一期
|
2026-02-02 11:28:58 +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 |
|
|
|
0ae0e32db9
|
Merge branch 'feat-cjy-customerContract' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
|
2026-02-02 10:22:10 +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 |
|
|
|
9750b0b505
|
feat:附件增加一个文件名称
|
2026-02-02 10:09:02 +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 |
|
|
|
4858d474d5
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-01-30 17:58:24 +08:00 |
|
|
|
25f323ef66
|
fix: 增加字数校验
|
2026-01-30 17:58:13 +08:00 |
|
|
|
6f429cf9c6
|
Merge branch 'feat-cjy-customerContract' into dev
|
2026-01-30 16:42:49 +08:00 |
|
|
|
2f893c8fd4
|
feat：增加校验
|
2026-01-30 16:42:40 +08:00 |
|
|
|
7581a337a7
|
解决冲突
|
2026-01-30 15:42:37 +08:00 |
|
|
|
0c930af71a
|
添加接口
|
2026-01-30 15:41:55 +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 |
|
|
|
295d26a35a
|
fix：修复子表没有uuid的问题
|
2026-01-30 15:17:38 +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 |
|
|
|
b5d7e7181b
|
fix：修复格式错误
|
2026-01-30 11:39:17 +08:00 |
|
|
|
b8edca7df5
|
fix： 创建时，不需要提供客户id
|
2026-01-30 11:31:47 +08:00 |
|
jiaji.H
|
d01f325ed4
|
Updata：增加接口数据字段
|
2026-01-30 11:16:21 +08:00 |
|
|
|
83b4e13457
|
feat：增加校验
|
2026-01-30 10:42:52 +08:00 |
|
|
|
418521b451
|
feat: 增加按照subNum排序
|
2026-01-30 09:35:19 +08:00 |
|
|
|
a903157725
|
feat：增加合同管理接口
|
2026-01-30 09:33:52 +08:00 |
|
|
|
3c2f4c7049
|
fix: 增加操作人相关信息
|
2026-01-30 09:32:08 +08:00 |
|
jiaji.H
|
d282c1d1f2
|
Updata：增加发票编号字段
|
2026-01-29 11:10:54 +08:00 |
|
jiaji.H
|
fb0e65eadc
|
Updata:新增字段
|
2026-01-29 10:46:25 +08:00 |
|
|
|
8c171a2416
|
feat:增加客户管理相关接口
|
2026-01-29 09:51:43 +08:00 |
|
|
|
cdb6d5b647
|
fix：移除客户id，移除客户地址，增加唯一索引
|
2026-01-29 09:48:11 +08:00 |
|
|
|
2a2fa85728
|
fix：客户名称增加唯一索引，避免重复
|
2026-01-29 09:00:57 +08:00 |
|
|
|
8e0f3c507f
|
feat：增加合同表和相关子表
|
2026-01-28 20:02:00 +08:00 |
|
|
|
cd18cc60b2
|
feat: 建立客户表数据表
|
2026-01-28 18:55:37 +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 |
|
|
|
95c9b0e4ac
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-27 14:45:47 +08:00 |
|
|
|
67d4cf0aaa
|
feat: 增加按照subNum排序
|
2026-01-27 14:45:09 +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
|
7459f3a6c3
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-26 13:08:30 +08:00 |
|
jiaji.H
|
0d1becb99b
|
Updata:增加竞品数手动扩展字段
|
2026-01-26 13:08:21 +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 |
|
|
|
a03f14de50
|
删除没用controller层没用的注释
|
2026-01-20 17:48:23 +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
|
8b6f5da73b
|
Updata：解决冲突
|
2026-01-12 13:40:37 +08:00 |
|
jiaji.H
|
c4ec01846f
|
Updata:调整余量更新定时任务至客户端
|
2026-01-12 13:28:47 +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 |
|
|
|
55a5ba3152
|
Merge branch 'jng'
|
2026-01-06 11:31:39 +08:00 |
|
|
|
ebf579a1a9
|
Merge branch 'jng' into dev
|
2026-01-05 15:16:43 +08:00 |
|
|
|
185e5da57a
|
Update bundle_order_records.go
|
2026-01-05 15:16:37 +08:00 |
|
jiaji.H
|
a795b5b491
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-05 13:47:38 +08:00 |
|
jiaji.H
|
55d1554e13
|
Updata：修正查询sql
|
2026-01-05 13:46:25 +08:00 |
|
jiaji.H
|
3b9661f03b
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-05 11:40:44 +08:00 |
|
jiaji.H
|
b9c44fdc7e
|
Updata：修正sql
|
2026-01-05 11:40:34 +08:00 |
|
jiaji.H
|
7b7ddd9613
|
Merge branch 'feat-hjj-Competitors#A203' into dev
|
2026-01-05 11:24:07 +08:00 |
|
jiaji.H
|
5ad9417042
|
Updata:导出补充竞品数字段
|
2026-01-05 11:23:55 +08:00 |
|
jiaji.H
|
fbd3c97547
|
Updata:解决冲突
|
2026-01-05 10:45:33 +08:00 |
|
jiaji.H
|
65ffc2c43a
|
Updata
|
2026-01-04 16:22:50 +08:00 |
|
jiaji.H
|
44c4a8627c
|
Updata：修正数据分析发放值
|
2026-01-04 16:22:18 +08:00 |
|
jiaji.H
|
7c4c7b0faa
|
Updata：更新余量定时任务发放数
|
2026-01-04 16:20:34 +08:00 |
|
jiaji.H
|
9632dc121a
|
Merge branch 'feat-hjj-BalanceManager' into dev
|
2026-01-04 16:02:01 +08:00 |
|
jiaji.H
|
8f5c21e3f2
|
Updata:修正bug
|
2026-01-04 16:01:51 +08:00 |
|
|
|
f228f73ef3
|
解决冲突
|
2026-01-04 15:13:08 +08:00 |
|
|
|
d730106309
|
添加自媒体账号选择
|
2026-01-04 15:11:45 +08:00 |
|
jiaji.H
|
f40fc853de
|
feat:列表布局增加竞品数字段
|
2026-01-04 14:32:08 +08:00 |
|
jiaji.H
|
2a75b9b6db
|
Updata：套餐与余量增加竞品数字段与对应功能
|
2026-01-04 11:12:34 +08:00 |
|
|
|
64a11237a3
|
fix: 修复重复引用
|
2025-12-28 13:00:47 +08:00 |
|
|
|
b8dfc8a6e6
|
Merge branch 'feat-cjy-taskLog' into dev
# Conflicts:
# internal/logic/bundleExtendLogic.go
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
# pkg/msg/msg.go
|
2025-12-28 12:56:46 +08:00 |
|
|
|
0bf1f34bba
|
feat: 增加日志创建
|
2025-12-28 11:40:57 +08:00 |
|
jiaji.H
|
32a9bb8283
|
Updata：修正套餐状态判断
|
2025-12-26 16:51:16 +08:00 |
|
jiaji.H
|
0e64d40489
|
Updata：增加套餐类型字段
|
2025-12-26 14:24:05 +08:00 |
|
|
|
d11a7a5c6a
|
解决冲突
|
2025-12-26 11:43:26 +08:00 |
|
|
|
edc85ae53e
|
解决冲突
|
2025-12-26 11:42:47 +08:00 |
|
|
|
7bc24961bf
|
Merge branch 'fix-cjy-workNum' into dev
|
2025-12-26 09:52:57 +08:00 |
|
|
|
c3873e0e3e
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-25 18:59:09 +08:00 |
|
|
|
10f336ec66
|
11
|
2025-12-25 18:59:03 +08:00 |
|
|
|
ad78d51967
|
Merge branch 'jng-contract-1225' into dev
|
2025-12-25 18:55:15 +08:00 |
|
|
|
fb77431848
|
Update bundle_order_records.go
|
2025-12-25 18:55:08 +08:00 |
|
|
|
bfffc58e16
|
解决冲突
|
2025-12-25 18:45:09 +08:00 |
|
|
|
fa640ed8ef
|
修改合同签署
|
2025-12-25 18:44:43 +08:00 |
|
|
|
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 |
|
