jiaji.H
|
66c2669557
|
feat：调整套餐差异更新逻辑
|
2025-09-12 10:37:25 +08:00 |
|
jiaji.H
|
bca70c5493
|
Updata：解决冲突
|
2025-09-11 15:32:15 +08:00 |
|
|
|
479cb7255f
|
Merge branch 'feat-sxy-0911' into dev
|
2025-09-11 15:13:12 +08:00 |
|
|
|
61b7fedf0d
|
修改
|
2025-09-11 15:12:13 +08:00 |
|
|
|
17b557df77
|
修改条件
|
2025-09-11 15:10:26 +08:00 |
|
jiaji.H
|
9635ec4572
|
Updata：区分套餐权益和附加权益
|
2025-09-11 14:54:21 +08:00 |
|
|
|
0dcbb3a057
|
解决冲突
|
2025-09-11 14:54:12 +08:00 |
|
|
|
64c56d5ca3
|
单价模式新加总价字段
|
2025-09-11 14:47:07 +08:00 |
|
jiaji.H
|
4d42019882
|
feat：分类权益
|
2025-09-10 13:55:41 +08:00 |
|
jiaji.H
|
5d47d6f1a9
|
feat:解决冲突
|
2025-09-09 11:02:31 +08:00 |
|
jiaji.H
|
2461bb8a93
|
feat：修改服务列表额度字段逻辑
|
2025-09-09 10:59:23 +08:00 |
|
|
|
1d6b207aea
|
添加套餐激活状态
|
2025-09-05 14:58:28 +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
|
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 |
|
|
|
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 |
|
|
|
40b3d8ddde
|
Merge branch 'dev-lzh' into dev
|
2025-06-27 17:57:24 +08:00 |
|
|
|
8fe858aa03
|
Merge branch 'main' of https://gitea-inner.fontree.cn/fiee/micro-bundle
|
2025-06-26 17:33:08 +08:00 |
|
|
|
f3e29cb7e8
|
解决冲突
|
2025-06-26 17:32:53 +08:00 |
|
|
|
ae4bbe29c0
|
Merge branch 'sxy'
|
2025-06-26 17:31:25 +08:00 |
|
|
|
bfc409ed70
|
Merge branch 'dev-lzh'
|
2025-06-26 17:18:58 +08:00 |
|
|
|
ea4d3cacd4
|
Merge branch 'sxy' into dev
|
2025-06-26 17:10:45 +08:00 |
|
|
|
a01be125e6
|
修改冲突
|
2025-06-26 17:10:29 +08:00 |
|
|
|
047451e5c4
|
Merge branch 'sxy' into dev
|
2025-06-25 13:37:43 +08:00 |
|
|
|
9c9e9c0663
|
修改返回数据校验
|
2025-06-25 13:36:33 +08:00 |
|
|
|
cd4e1492c8
|
Merge branch 'sxy' into dev
|
2025-06-24 16:01:05 +08:00 |
|
|
|
668b7eb06e
|
修改信息-服务类型
|
2025-06-24 16:00:45 +08:00 |
|
|
|
6e29d40998
|
Merge branch 'sxy' into dev
|
2025-06-24 15:54:25 +08:00 |
|
|
|
56c17a709f
|
修改信息
|
2025-06-24 15:53:10 +08:00 |
|
|
|
d6888a4e3c
|
Merge branch 'dev-lzh' into dev
|
2025-06-24 15:14:18 +08:00 |
|
|
|
043274e61f
|
添加余量信息已购买字段
|
2025-06-24 15:08:37 +08:00 |
|
|
|
e46e5a3635
|
Merge branch 'sxy' into dev
|
2025-06-24 14:25:06 +08:00 |
|
|
|
3c1984be81
|
增加语言表获取接口
|
2025-06-24 14:22:31 +08:00 |
|
|
|
a45369d1b5
|
Merge branch 'sxy' into dev
|
2025-06-23 16:25:17 +08:00 |
|
|
|
52d9baf2e6
|
修改上下架校验
|
2025-06-23 16:25:03 +08:00 |
|
|
|
cba59941cb
|
Merge branch 'sxy' into dev
|
2025-06-23 15:24:05 +08:00 |
|
|
|
ed0f0c9584
|
修改套餐逻辑
|
2025-06-23 15:23:49 +08:00 |
|
|
|
edc93077a7
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 16:57:07 +08:00 |
|
|
|
75a75e9480
|
时区错误修改
|
2025-06-20 16:57:01 +08:00 |
|
|
|
f9510db2eb
|
Merge branch 'sxy' into dev
|
2025-06-20 16:26:40 +08:00 |
|
|
|
d0dfb7ff96
|
修改增值服务价格模式下的节省金额
|
2025-06-20 16:26:17 +08:00 |
|
|
|
fabc41aa92
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 16:18:45 +08:00 |
|
|
|
c6a65f4589
|
1
|
2025-06-20 15:54:06 +08:00 |
|
|
|
c61ab9c0bd
|
Merge branch 'sxy' into dev
|
2025-06-20 15:35:06 +08:00 |
|
|
|
a6d315a283
|
修改增值服务保存逻辑-1
|
2025-06-20 15:34:55 +08:00 |
|
|
|
9d57cb0188
|
Merge branch 'sxy' into dev
|
2025-06-20 15:27:01 +08:00 |
|
|
|
952caaaf91
|
修改增值服务保存逻辑
|
2025-06-20 15:26:35 +08:00 |
|
|
|
32632183cf
|
Merge branch 'sxy' into dev
|
2025-06-20 14:58:46 +08:00 |
|
|
|
bff2938313
|
修改返回信息
|
2025-06-20 14:58:32 +08:00 |
|
|
|
44f40ee10f
|
Merge branch 'sxy' into dev
|
2025-06-20 14:34:09 +08:00 |
|
|
|
97c4bda203
|
修改价格模式-1
|
2025-06-20 14:33:57 +08:00 |
|
|
|
14415f07f5
|
修改价格模式
|
2025-06-20 14:31:55 +08:00 |
|
|
|
e39b72f666
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 14:07:02 +08:00 |
|
|
|
94e5c77f90
|
过期时间精确到秒
|
2025-06-20 14:06:24 +08:00 |
|
|
|
8febf219f7
|
Merge branch 'sxy' into dev
|
2025-06-20 13:05:59 +08:00 |
|
|
|
d95dccf7c0
|
修改bug
|
2025-06-20 13:05:32 +08:00 |
|
|
|
ece5feb935
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 10:27:23 +08:00 |
|
|
|
9b6549f141
|
添加关联订单号字段
|
2025-06-20 10:27:00 +08:00 |
|
|
|
8f6326bfaf
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 09:42:49 +08:00 |
|
|
|
f612f8ad23
|
补充缺失字段
|
2025-06-20 09:42:14 +08:00 |
|
|
|
0304b71d8f
|
Merge branch 'sxy' into dev
|
2025-06-19 16:44:57 +08:00 |
|
|
|
33073667e8
|
修改上下架
|
2025-06-19 16:44:38 +08:00 |
|
|
|
41cd63b88a
|
Merge branch 'dev-lzh' into dev
|
2025-06-19 16:36:36 +08:00 |
|
|
|
02d0de5dad
|
使用真实姓名
|
2025-06-19 16:36:28 +08:00 |
|
|
|
44e5c9abe7
|
Merge branch 'sxy' into dev
|
2025-06-19 16:18:53 +08:00 |
|
|
|
ac14519c91
|
修改
|
2025-06-19 16:18:41 +08:00 |
|
|
|
792834ec27
|
Merge branch 'sxy' into dev
|
2025-06-19 16:17:38 +08:00 |
|
|
|
bdc9706125
|
修改
|
2025-06-19 16:16:23 +08:00 |
|
|
|
734c0b2c1f
|
修改
|
2025-06-19 16:12:03 +08:00 |
|
|
|
829891cb7c
|
Revert "Merge branch 'sxy' into dev"
This reverts commit 1883adf5b5, reversing
changes made to 044f79575c.
|
2025-06-19 15:47:44 +08:00 |
|
|
|
1883adf5b5
|
Merge branch 'sxy' into dev
|
2025-06-19 15:46:55 +08:00 |
|
|
|
fdf2d5a09b
|
修改h5列表
|
2025-06-19 15:44:55 +08:00 |
|
|
|
044f79575c
|
解决冲突
|
2025-06-19 15:29:41 +08:00 |
|
|
|
c537e1e50c
|
修改
|
2025-06-19 15:26:08 +08:00 |
|
|
|
46c62fa213
|
Merge branch 'sxy' into dev
|
2025-06-19 14:23:18 +08:00 |
|
|
|
53fdc7c4b6
|
修改套餐同步更新
|
2025-06-19 14:22:57 +08:00 |
|
|
|
eacfce8ea6
|
Merge branch 'sxy' into dev
|
2025-06-19 11:47:15 +08:00 |
|
|
|
eac7c759f6
|
修改错误信息返回
|
2025-06-19 11:46:53 +08:00 |
|
|
|
000de78286
|
修改错误信息返回
|
2025-06-19 11:43:54 +08:00 |
|
|
|
df96102509
|
Merge branch 'sxy' into dev
|
2025-06-18 15:49:43 +08:00 |
|
|
|
6107e35aca
|
修改
|
2025-06-18 15:49:21 +08:00 |
|
|
|
412e679b94
|
Merge branch 'sxy' into dev
|
2025-06-18 11:42:56 +08:00 |
|
|
|
4c027c4a08
|
修改
|
2025-06-18 11:42:39 +08:00 |
|
|
|
19ac6f4bf3
|
Merge branch 'dev-lzh' into dev
|
2025-06-17 14:15:36 +08:00 |
|
|
|
32de65196b
|
添加确认状态
|
2025-06-17 14:14:09 +08:00 |
|
|
|
5e6f69bacf
|
Merge branch 'sxy' into dev
|
2025-06-17 09:26:29 +08:00 |
|
|
|
0c5ffdcc90
|
增加clor
|
2025-06-17 09:24:18 +08:00 |
|
|
|
412350cf8a
|
修改错误信息
|
2025-06-16 14:29:18 +08:00 |
|
