Commit Graph

132 Commits

Author SHA1 Message Date
4042fd297d 订单详情接口调整 2025-10-27 09:10:03 +08:00
xuelijun
3497962627 Merge branch 'feature/order' into xlj 2025-10-24 17:30:30 +08:00
xuelijun
15e801e426 Merge remote-tracking branch 'origin/feature/order' into feature/order 2025-10-24 17:29:48 +08:00
xuelijun
b2e0cca804 图片 2025-10-24 17:29:14 +08:00
22b96b6feb 订单详情接口调整 2025-10-24 16:50:36 +08:00
fc62fa3167 订单详情接口调整 2025-10-23 13:34:32 +08:00
190e0e1605 订单详情接口调整 2025-10-17 18:32:04 +08:00
3fbb1383fd 订单详情接口调整 2025-10-16 16:49:36 +08:00
191eadbf77 调整分支 2025-10-16 15:34:55 +08:00
xuelijun
7fdf546585 Merge remote-tracking branch 'origin/feature/order' into xlj 2025-10-16 15:30:47 +08:00
b6630f3f61 Merge branch 'refs/heads/xlj' into feature/order 2025-10-16 15:29:17 +08:00
f7d4ef8e4c Merge remote-tracking branch 'refs/remotes/origin/xlj' into feature/order
# Conflicts:
#	tashow-module/tashow-module-infra/src/main/resources/application-local.yaml
2025-10-16 15:28:17 +08:00
xuelijun
ef99dbe035 店铺信息 2025-10-16 15:27:17 +08:00
e5f0d57286 调整 2025-10-16 13:53:07 +08:00
de062744b4 调整ai模块 2025-10-15 15:28:44 +08:00
2943caf779 Merge branch 'develop' into feature/order
# Conflicts:
#	tashow-module/pom.xml
#	tashow-module/tashow-module-infra/src/main/resources/application-local.yaml
2025-10-15 11:33:01 +08:00
6ff940777f 添加订单sql文件 2025-10-15 11:31:40 +08:00
1cdbf43f29 调整 ai模块 2025-10-15 11:30:50 +08:00
89c233ca9f 调整 ai模块 2025-10-15 09:27:51 +08:00
5a45668c61 调整 ai模块 2025-10-14 15:54:50 +08:00
22fc268fcb 调整 ai模块 2025-10-14 15:19:49 +08:00
077fb92772 调整 ai模块 2025-10-13 15:09:27 +08:00
a1c4ae3564 添加 ai模块 2025-09-30 17:35:00 +08:00
98fc7be679 添加 ai模块 2025-09-25 17:48:08 +08:00
4ae13cf1e6 解决启动问题 2025-09-24 11:36:14 +08:00
ab85648edf Merge remote-tracking branch 'origin/xlj' into feature/translate 2025-09-24 10:10:16 +08:00
cba541169d 添加翻译模块 2025-09-24 10:09:54 +08:00
53e88feefe 删除不必要文件 2025-09-24 09:43:39 +08:00
562769f9c0 会员与支付sql 2025-09-24 09:35:25 +08:00
xuelijun
73748a6fc0 修改配置 2025-09-20 18:22:25 +08:00
3f674bd17a 调整订单接口 2025-08-29 09:44:37 +08:00
xuelijun
a6b1cb2ac9 获取服务信息1 2025-08-27 10:13:36 +08:00
52839e17cc 会员与支付sql 2025-08-27 10:04:19 +08:00
1555739fcd 初始化order和pay模块 2025-08-27 10:02:53 +08:00
xuelijun
ecb8f31850 获取服务信息 2025-08-27 09:12:34 +08:00
xuelijun
4711bb8cbc 修改上下架bug 2025-08-26 10:54:51 +08:00
xuelijun
40f0ecd162 规格回收站bug1 2025-08-25 15:39:41 +08:00
xuelijun
27e51b6278 规格回收站bug 2025-08-25 11:01:25 +08:00
xuelijun
eeab4e5ea3 规格回收站 2025-08-20 16:39:54 +08:00
xuelijun
a5f992c090 获取服务配置2 2025-08-19 18:27:27 +08:00
xuelijun
a99402c6b0 获取服务配置1 2025-08-18 14:41:52 +08:00
ea780302e3 Merge remote-tracking branch 'origin/xlj' into feature/order
# Conflicts:
#	tashow-feign/pom.xml
#	tashow-module/pom.xml
#	tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/controller.vm
#	tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/listReqVO.vm
#	tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/pageReqVO.vm
#	tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/respVO.vm
#	tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/saveReqVO.vm
#	tashow-module/tashow-module-system/src/main/resources/application-local.yaml
2025-08-18 10:11:32 +08:00
xuelijun
ce643990d8 获取服务配置 2025-08-15 18:27:57 +08:00
xuelijun
7afa85b941 sku规则恢复和列表 2025-08-14 14:13:29 +08:00
xuelijun
257dc16c94 优化BUG 2025-08-13 09:18:21 +08:00
xuelijun
5987f02e4e 优化 2025-08-07 18:34:03 +08:00
xuelijun
525cf97121 获得SKU回收站分页列表1 2025-08-07 10:36:38 +08:00
xuelijun
cde19e180a 获得SKU回收站分页列表 2025-08-05 17:20:56 +08:00
xuelijun
360c497c49 规则修改 2:sku模块 2025-08-05 15:38:12 +08:00
xuelijun
038a09f286 获取sku扩展服务配置信息 2025-08-02 17:00:48 +08:00