Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot

# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/IotThinkModelFunctionController.http
This commit is contained in:
YunaiV
2025-02-09 07:23:17 +08:00
68 changed files with 707 additions and 359 deletions

View File

@@ -2,7 +2,7 @@
POST {{appApi}}/pay/order/submit
Content-Type: application/json
Authorization: Bearer {{appToken}}
tenant-id: {{appTenentId}}
tenant-id: {{appTenantId}}
{
"id": 174,
@@ -13,7 +13,7 @@ tenant-id: {{appTenentId}}
POST {{appApi}}/pay/order/submit
Content-Type: application/json
Authorization: Bearer {{appToken}}
tenant-id: {{appTenentId}}
tenant-id: {{appTenantId}}
{
"id": 202,
@@ -27,7 +27,7 @@ tenant-id: {{appTenentId}}
POST {{appApi}}/pay/order/submit
Content-Type: application/json
Authorization: Bearer {{appToken}}
tenant-id: {{appTenentId}}
tenant-id: {{appTenantId}}
{
"id": 202,
@@ -41,7 +41,7 @@ tenant-id: {{appTenentId}}
POST {{appApi}}/pay/order/submit
Content-Type: application/json
Authorization: Bearer {{appToken}}
tenant-id: {{appTenentId}}
tenant-id: {{appTenantId}}
{
"id": 202,
@@ -55,7 +55,7 @@ tenant-id: {{appTenentId}}
POST {{appApi}}/pay/order/submit
Content-Type: application/json
Authorization: Bearer {{appToken}}
tenant-id: {{appTenentId}}
tenant-id: {{appTenantId}}
{
"id": 202,