From a322c60e5fa8c4c7fc86ad24153d29592c3b8b05 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 四月 2025 11:51:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryServe.java | 4 ++--
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 1 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderQueryRequest.java | 3 +++
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/CoverController.java | 2 --
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/CoverController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/CoverController.java
index 8fea774..a3026eb 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/CoverController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/CoverController.java
@@ -39,7 +39,6 @@
/**
* 背景图管理查询
*/
- @RequiresPermissions("system_cover")
@ApiOperation(value = "背景图管理查询", tags = {"后台-系统设置-背景图管理查询[2.0]","小程序-背景图管理查询[2.0]"})
@GetMapping(value = "/getCoverDetail")
public R<Cover> getCoverDetail() {
@@ -49,7 +48,6 @@
/**
* 背景图管理修改
*/
- @RequiresPermissions("system_cover_update")
@ApiOperation(value = "背景图管理修改", tags = {"后台-系统设置-背景图管理修改[2.0]"})
@PostMapping(value = "/updateCover")
public R<String> updateCover(@RequestBody Cover cover) {
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryServe.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryServe.java
index dbae265..3291f68 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryServe.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryServe.java
@@ -62,7 +62,7 @@
private String rotate;
@ApiModelProperty("回收补贴价")
- @TableField("sys_recovery_serve")
- private BigDecimal sysRecoveryServe;
+ @TableField("recycle_subsidy")
+ private BigDecimal recycleSubsidy;
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 8d445e0..6b361cb 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -221,6 +221,7 @@
@Override
public Page<Order> orderListWorker(Integer userId, Integer state,String searchValues, Integer pageNum, Integer pageSize) {
+ Page<Order> orderPage = baseMapper.orderListWorker(userId, state, searchValues, Page.of(pageNum, pageSize));
return baseMapper.orderListWorker(userId, state,searchValues, Page.of(pageNum, pageSize));
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderQueryRequest.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderQueryRequest.java
index 0dd7d83..6239fdf 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderQueryRequest.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderQueryRequest.java
@@ -77,4 +77,7 @@
private String completeTimeEnd;
private List<String> siteIds;
+ @ApiModelProperty(value = "完工时间排序 1=升序 2=降序")
+ private Integer completeType ;
+
}
--
Gitblit v1.7.1