From f664bea25bee4609721dd8fbbcc0205878772d9a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 二月 2023 16:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
index f16be0a..e1535ec 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
@@ -70,7 +70,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(Integer couponType,Integer couponServiceType,String createtime) {
+ public Object list(Integer couponType,Integer couponServiceType,String createTime) {
EntityWrapper<TCoupon> wrapper = new EntityWrapper<>();
if(Objects.nonNull(couponType)){
wrapper.eq("coupon_type",couponType);
@@ -79,13 +79,13 @@
wrapper.eq("coupon_service_type",couponServiceType);
}
// 开始，结束时间
- if(StringUtils.hasLength(createtime)){
- String[] split = createtime.split(" - ");
+ if(StringUtils.hasLength(createTime)){
+ String[] split = createTime.split(" - ");
Date startTime = DateUtil.getDate_str4(split[0]);
Date endTime = DateUtil.getDate_str4(split[1]);
- wrapper.between("createtime",startTime,endTime);
+ wrapper.between("create_time",startTime,endTime);
}
- wrapper.orderBy(true,"createtime",false);
+ wrapper.orderBy(true,"create_time",false);
wrapper.groupBy(true,"coupon_name");
wrapper.groupBy(true,"coupon_type");
return tCouponService.selectList(wrapper);
--
Gitblit v1.7.1