From 26d24ccf61613446c7740d8c0ef3e201cf5f5274 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 02 十月 2023 12:59:40 +0800
Subject: [PATCH] 修改
---
ycl-platform/src/main/java/com/ycl/controller/smoke/InTimeController.java | 5 ++---
ycl-platform/src/main/resources/mapper/smoke/OdsCustomerMapper.xml | 2 +-
ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml | 2 +-
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java | 2 +-
ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsCustomerServiceImpl.java | 2 +-
ycl-platform/src/main/java/com/ycl/entity/smoke/OdsCustomer.java | 4 ++--
6 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeController.java b/ycl-platform/src/main/java/com/ycl/controller/smoke/InTimeController.java
similarity index 96%
rename from ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeController.java
rename to ycl-platform/src/main/java/com/ycl/controller/smoke/InTimeController.java
index 3f5641d..a703a9b 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/smoke/InTimeController.java
@@ -10,16 +10,15 @@
import com.ycl.entity.smoke.OdsInTime;
import com.ycl.service.smoke.IOdsCustomerService;
import com.ycl.service.smoke.IOdsInTimeService;
-import com.ycl.vo.store.StoreInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@RestController
-@RequestMapping("/smoker")
+@RequestMapping("/smoke")
@Api(tags = "娌圭儫绠＄悊绠＄悊")
-public class SmokeController extends BaseController {
+public class InTimeController extends BaseController {
IOdsInTimeService inTimeService;
IOdsCustomerService customerService;
diff --git a/ycl-platform/src/main/java/com/ycl/entity/smoke/OdsCustomer.java b/ycl-platform/src/main/java/com/ycl/entity/smoke/OdsCustomer.java
index 26410c3..a421d8f 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/smoke/OdsCustomer.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/smoke/OdsCustomer.java
@@ -182,9 +182,9 @@
/**
* 浠嬬粛
*/
- @TableField("desc1")
+ @TableField("description")
@JsonProperty("Desc")
- private String desc;
+ private String description;
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsCustomerServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsCustomerServiceImpl.java
index 2520424..820f79e 100644
--- a/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsCustomerServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsCustomerServiceImpl.java
@@ -30,7 +30,7 @@
if (StrUtil.isNotEmpty(keyword)) {
lambda.like(OdsCustomer::getName, keyword);
}
-
+ lambda.orderByAsc(OdsCustomer::getId);
return this.page(page, wrapper);
}
}
diff --git a/ycl-platform/src/main/resources/mapper/smoke/OdsCustomerMapper.xml b/ycl-platform/src/main/resources/mapper/smoke/OdsCustomerMapper.xml
index ad08464..a2591f5 100644
--- a/ycl-platform/src/main/resources/mapper/smoke/OdsCustomerMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/smoke/OdsCustomerMapper.xml
@@ -24,7 +24,7 @@
<result column="area_ids" property="areaIdsString" />
<result column="area_id_cascads" property="areaIdCascadsString" />
<result column="areas" property="areasString" />
- <result column="desc1" property="desc" />
+ <result column="desc1" property="description" />
</resultMap>
<!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java
index 88a8f88..dc293b3 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java
@@ -183,7 +183,7 @@
/**
* 浠嬬粛
*/
- @TableField("desc1")
+ @TableField("description")
@JsonProperty("Desc")
private String desc;
diff --git a/ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml b/ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml
index c4fa9d6..3232ac3 100644
--- a/ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml
+++ b/ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml
@@ -24,7 +24,7 @@
<result column="area_ids" property="areaIdsString" />
<result column="area_id_cascads" property="areaIdCascadsString" />
<result column="areas" property="areasString" />
- <result column="desc1" property="desc" />
+ <result column="description" property="desc" />
</resultMap>
<!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
--
Gitblit v1.8.0