Commit Graph

181 Commits

Author SHA1 Message Date
jiaji.H
5d47d6f1a9 feat:解决冲突 2025-09-09 11:02:31 +08:00
jiaji.H
2461bb8a93 feat:修改服务列表额度字段逻辑 2025-09-09 10:59:23 +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
cjy
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
cjy
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
lzh
40b3d8ddde Merge branch 'dev-lzh' into dev 2025-06-27 17:57:24 +08:00
sxy
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
sxy
ae4bbe29c0 Merge branch 'sxy' 2025-06-26 17:31:25 +08:00
lzh
bfc409ed70 Merge branch 'dev-lzh' 2025-06-26 17:18:58 +08:00
sxy
ea4d3cacd4 Merge branch 'sxy' into dev 2025-06-26 17:10:45 +08:00
sxy
a01be125e6 修改冲突 2025-06-26 17:10:29 +08:00
sxy
047451e5c4 Merge branch 'sxy' into dev 2025-06-25 13:37:43 +08:00
sxy
9c9e9c0663 修改返回数据校验 2025-06-25 13:36:33 +08:00
sxy
cd4e1492c8 Merge branch 'sxy' into dev 2025-06-24 16:01:05 +08:00
sxy
668b7eb06e 修改信息-服务类型 2025-06-24 16:00:45 +08:00
sxy
6e29d40998 Merge branch 'sxy' into dev 2025-06-24 15:54:25 +08:00
sxy
56c17a709f 修改信息 2025-06-24 15:53:10 +08:00
lzh
d6888a4e3c Merge branch 'dev-lzh' into dev 2025-06-24 15:14:18 +08:00
lzh
043274e61f 添加余量信息已购买字段 2025-06-24 15:08:37 +08:00
sxy
e46e5a3635 Merge branch 'sxy' into dev 2025-06-24 14:25:06 +08:00
sxy
3c1984be81 增加语言表获取接口 2025-06-24 14:22:31 +08:00
sxy
a45369d1b5 Merge branch 'sxy' into dev 2025-06-23 16:25:17 +08:00
sxy
52d9baf2e6 修改上下架校验 2025-06-23 16:25:03 +08:00
sxy
cba59941cb Merge branch 'sxy' into dev 2025-06-23 15:24:05 +08:00
sxy
ed0f0c9584 修改套餐逻辑 2025-06-23 15:23:49 +08:00
lzh
edc93077a7 Merge branch 'dev-lzh' into dev 2025-06-20 16:57:07 +08:00
lzh
75a75e9480 时区错误修改 2025-06-20 16:57:01 +08:00
sxy
f9510db2eb Merge branch 'sxy' into dev 2025-06-20 16:26:40 +08:00
sxy
d0dfb7ff96 修改增值服务价格模式下的节省金额 2025-06-20 16:26:17 +08:00
lzh
fabc41aa92 Merge branch 'dev-lzh' into dev 2025-06-20 16:18:45 +08:00
lzh
c6a65f4589 1 2025-06-20 15:54:06 +08:00
sxy
c61ab9c0bd Merge branch 'sxy' into dev 2025-06-20 15:35:06 +08:00
sxy
a6d315a283 修改增值服务保存逻辑-1 2025-06-20 15:34:55 +08:00
sxy
9d57cb0188 Merge branch 'sxy' into dev 2025-06-20 15:27:01 +08:00
sxy
952caaaf91 修改增值服务保存逻辑 2025-06-20 15:26:35 +08:00
sxy
32632183cf Merge branch 'sxy' into dev 2025-06-20 14:58:46 +08:00