Commit Graph

557 Commits

Author SHA1 Message Date
lzh
7ea566bd9b Merge branch 'dev-lzh-1009' into dev 2025-10-09 17:59:39 +08:00
lzh
422d2acb5a 添加使用类型字段 2025-10-09 17:09:43 +08:00
lzh
5edac38772 更新proto 2025-09-28 14:18:11 +08:00
lzh
b80ce9ec70 Merge branch 'dev-lzh-0905' into dev 2025-09-24 11:40:57 +08:00
lzh
8b35ba97c8 使用秒级时间戳 2025-09-24 11:40:45 +08:00
lzh
01fa323c4d Merge branch 'dev-lzh-0905' into dev 2025-09-24 11:35:04 +08:00
lzh
cf07e0d29b 时间过滤条件修改 2025-09-24 11:34:57 +08:00
lzh
5b9bfc11b1 Merge branch 'dev-lzh-0905' into dev 2025-09-24 11:23:07 +08:00
lzh
1112d253ee 格式化提交时间 2025-09-24 11:22:39 +08:00
lzh
640eb0d58c 1 2025-09-23 14:23:56 +08:00
lzh
8590d6cd9c Merge branch 'dev-lzh-0905' into dev 2025-09-23 14:23:37 +08:00
lzh
9b37dab44f 添加确认时间字段 2025-09-23 14:23:24 +08:00
lzh
5d46b21645 Merge branch 'dev-lzh-0905' into dev 2025-09-23 14:19:20 +08:00
lzh
ec1e99ec42 添加作品提交时间 2025-09-23 14:17:32 +08:00
jiaji.H
76e4b7c998 Merge branch 'feat-hjj-packageManage#A116' into dev 2025-09-19 10:57:12 +08:00
jiaji.H
91fa9afa58 Updata:添加套餐数量符号检验 2025-09-19 10:54:03 +08:00
jiaji.H
cf427ec269 Updata:解决冲突 2025-09-17 11:20:49 +08:00
jiaji.H
5f4e1610d3 Updata:增加注释 2025-09-17 11:20:01 +08:00
jiaji.H
5fd972942b Updata:订单添加增值服务信息 2025-09-17 11:16:22 +08:00
jiaji.H
95a6219fd7 Updata:解决冲突 2025-09-16 13:47:01 +08:00
jiaji.H
2fc46f8bb7 Updata:优化套餐查询逻辑效率 2025-09-16 13:45:16 +08:00
jiaji.H
1b9a64068a Upfata:新增套餐字段添加 2025-09-16 13:25:32 +08:00
JNG
ec5abc5fe4 解决冲突 2025-09-15 19:07:25 +08:00
JNG
897f375130 11 2025-09-15 19:07:00 +08:00
jiaji.H
6e2bff33da Updata:解决冲突 2025-09-15 15:08:50 +08:00
jiaji.H
7edef20a45 feat:返回值中添加服务默认数量 2025-09-15 14:55:54 +08:00
jiaji.H
75de934c4f feat:新增加服务添加是否默认选项 2025-09-15 14:33:26 +08:00
jiaji.H
7c08286128 feat:添加套餐权益与附加套餐权益合理性验证 2025-09-15 13:53:32 +08:00
jiaji.H
4e066d88d5 Merge branch 'feat-hjj-packageManage#A116' into dev 2025-09-12 13:20:46 +08:00
jiaji.H
e406bcc63a Updata:更新套餐类型检索逻辑 2025-09-12 13:20:35 +08:00
jiaji.H
0595617645 Merge branch 'feat-hjj-packageManage#A116' into dev 2025-09-12 10:45:02 +08:00
jiaji.H
51f1c674fa Updata:调整接口名称 2025-09-12 10:44:49 +08:00
jiaji.H
9830f38ffb Merge branch 'feat-hjj-packageManage#A116' into dev 2025-09-12 10:38:21 +08:00
jiaji.H
66c2669557 feat:调整套餐差异更新逻辑 2025-09-12 10:37:25 +08:00
jiaji.H
bca70c5493 Updata:解决冲突 2025-09-11 15:32:15 +08:00
sxy
479cb7255f Merge branch 'feat-sxy-0911' into dev 2025-09-11 15:13:12 +08:00
sxy
61b7fedf0d 修改 2025-09-11 15:12:13 +08:00
sxy
17b557df77 修改条件 2025-09-11 15:10:26 +08:00
jiaji.H
9635ec4572 Updata:区分套餐权益和附加权益 2025-09-11 14:54:21 +08:00
JNG
0dcbb3a057 解决冲突 2025-09-11 14:54:12 +08:00
sxy
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
jiaji.H
49f89d1319 Merge branch 'feat-hjj-packageManage#A116' into dev 2025-09-09 10:16:23 +08:00
jiaji.H
2280cc40d9 Updata:更新数据库字段定义 2025-09-09 09:26:21 +08:00
lzh
1d6b207aea 添加套餐激活状态 2025-09-05 14:58:28 +08:00
cjy
73d997f754 Merge branch 'feat-cjy-taskBanch' into dev 2025-09-05 09:35:14 +08:00
cjy
dad33b003e bugfix: 修复查询报错 2025-09-05 09:34:07 +08:00
cjy
b6dd26f8a3 Merge branch 'feat-cjy-taskBanch' into dev 2025-09-04 19:02:39 +08:00