|
|
b6dd26f8a3
|
Merge branch 'feat-cjy-taskBanch' into dev
|
2025-09-04 19:02:39 +08:00 |
|
|
|
c18f4162ff
|
bugfix:修改关于时间区间的处理
|
2025-09-04 19:01:15 +08:00 |
|
jiaji.H
|
caca0d91c7
|
Merge branch 'feat-hjj-packageManage#A116' into dev
|
2025-09-04 13:26:26 +08:00 |
|
jiaji.H
|
7741a5dc35
|
Updata：不在定义内的额度信息
|
2025-09-04 13:25:52 +08:00 |
|
jiaji.H
|
a803a80f52
|
Merge branch 'feat-hjj-packageManage#A116' into dev
|
2025-09-04 11:55:58 +08:00 |
|
jiaji.H
|
04b4b3f7c5
|
Updata：去除不必要err
|
2025-09-04 11:55:50 +08:00 |
|
jiaji.H
|
e5d4e80e19
|
feat：解决冲突
|
2025-09-04 11:41:12 +08:00 |
|
jiaji.H
|
4b999f57c4
|
Updata：更新pb文件
|
2025-09-04 11:34:13 +08:00 |
|
|
|
ab79bf6e89
|
bugfix:增加模糊查询艺人名字
|
2025-09-03 17:54:16 +08:00 |
|
jiaji.H
|
1624992428
|
Updata：添加需求字段赋值
|
2025-09-03 16:29:36 +08:00 |
|
|
|
478c553c37
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
|
2025-09-03 16:23:56 +08:00 |
|
jiaji.H
|
c1e1ef5e0f
|
Updata：补充筛选逻辑
|
2025-09-03 15:57:56 +08:00 |
|
|
|
019197fc15
|
feat: 新增任务台功能
新增任务管理台功能
|
2025-09-03 15:51:35 +08:00 |
|
jiaji.H
|
1c148b0078
|
feat：增加对增值服务的名称和类型筛选以及额度字段和是否过期作废字段展示
|
2025-09-03 15:21:02 +08:00 |
|
jiaji.H
|
0c7f70af93
|
feat:增加额度对应需求字段
|
2025-09-03 11:33:05 +08:00 |
|
|
|
49b7c0c529
|
Merge branch 'jng' into dev
|
2025-08-27 10:42:32 +08:00 |
|
|
|
81e5d2f440
|
Update go.mod
|
2025-08-27 10:42:24 +08:00 |
|
|
|
6a943ed3bd
|
Merge branch 'jng' into dev
|
2025-08-27 10:23:31 +08:00 |
|
|
|
52c23bdd43
|
更新
|
2025-08-27 10:23:22 +08:00 |
|
|
|
567f70c610
|
Merge branch 'jng' into dev
|
2025-07-16 19:01:27 +08:00 |
|
|
|
2edf4b82ae
|
修改
|
2025-07-16 19:01:04 +08:00 |
|
|
|
567503bcd6
|
Merge branch 'jng' into dev
|
2025-07-16 18:18:44 +08:00 |
|
|
|
145486aec2
|
修改
|
2025-07-16 18:18:24 +08:00 |
|
|
|
6cf7804b39
|
修改
|
2025-07-16 17:53:27 +08:00 |
|
|
|
b149446170
|
修改
|
2025-07-16 17:52:50 +08:00 |
|
|
|
24102eccbd
|
11
|
2025-07-08 16:16:04 +08:00 |
|
|
|
dad01f7f85
|
解决冲突
|
2025-07-08 16:12:50 +08:00 |
|
|
|
383a64077d
|
添加手续费
|
2025-07-08 16:12:16 +08:00 |
|
|
|
68dd832b32
|
fix: 处理pb冲突
|
2025-07-08 15:21:20 +08:00 |
|
|
|
346dcb1d94
|
Merge branch 'feat-zjy-issue-013' into main
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-07-08 15:20:34 +08:00 |
|
|
|
170793fbd7
|
Merge branch 'feat-zjy-issue-013' into dev
|
2025-07-08 15:10:57 +08:00 |
|
|
|
de204751ac
|
修改
|
2025-07-08 15:10:45 +08:00 |
|
|
|
2e845b4fe1
|
修改
|
2025-07-08 15:10:26 +08:00 |
|
|
|
b2732eeaf9
|
解决冲突
|
2025-07-08 14:18:05 +08:00 |
|
|
|
744328055c
|
添加手续费
|
2025-07-08 14:17:38 +08:00 |
|
|
|
1dada43e0c
|
解决冲突
|
2025-07-07 19:34:57 +08:00 |
|
|
|
234d86896a
|
添加excel导入
|
2025-07-07 19:27:51 +08:00 |
|
|
|
402a7644e6
|
fix: 提交支持自动创建用户和订单代码
|
2025-07-07 13:31:17 +08:00 |
|
|
|
841ec173c4
|
Merge branch 'dev-lzh'
|
2025-07-07 11:58:32 +08:00 |
|
|
|
776574c4e0
|
Merge branch 'dev-lzh' into dev
|
2025-07-07 10:46:51 +08:00 |
|
|
|
87b7805c42
|
添加扩展记录的时间单位
|
2025-07-07 10:46:13 +08:00 |
|
|
|
d5e4c9590f
|
Merge branch 'jng'
|
2025-07-03 16:11:44 +08:00 |
|
|
|
bda31412ee
|
Merge branch 'jng' into dev
|
2025-07-03 14:31:35 +08:00 |
|
|
|
e9f12cd0eb
|
111
|
2025-07-03 14:28:09 +08:00 |
|
|
|
e7a5e19472
|
添加手续费字段
|
2025-07-03 14:02:25 +08:00 |
|
|
|
76e2b893a1
|
解决冲突
|
2025-07-02 15:30:51 +08:00 |
|
|
|
641c10aec2
|
解决冲突
|
2025-07-02 14:01:44 +08:00 |
|
|
|
0f40072e22
|
添加支付时间筛选
|
2025-07-02 14:00:54 +08:00 |
|
|
|
57a3154634
|
fix: 拦截重复回调
|
2025-06-27 20:03:21 +08:00 |
|
|
|
40b3d8ddde
|
Merge branch 'dev-lzh' into dev
|
2025-06-27 17:57:24 +08:00 |
|
