1、

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IAgencyClient.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam;
 import org.springblade.community.entity.Agency;
 import org.springblade.community.vo.AgencyVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,7 +26,7 @@ public interface IAgencyClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    AgencyVO detail(Agency agency);
+    AgencyVO detail(@SpringQueryMap Agency agency);
 
 	/**
 	 * 通过id获取
@@ -37,7 +38,7 @@ public interface IAgencyClient  {
 	 * 查询
 	 */
 	@GetMapping("/list")
-    List<AgencyVO> list(Agency agency);
+    List<AgencyVO> list(@SpringQueryMap Agency agency);
 
 	/**
 	 * 查询

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IBuildingClient.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import org.springblade.community.entity.Building;
 import org.springblade.community.vo.BuildingVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,7 +25,7 @@ public interface IBuildingClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    BuildingVO detail(Building building);
+    BuildingVO detail(@SpringQueryMap Building building);
 
 	/**
 	 * 详情
@@ -36,7 +37,7 @@ public interface IBuildingClient  {
 	 * 查询
 	 */
 	@GetMapping("/list")
-    List<BuildingVO> list(Building building);
+    List<BuildingVO> list(@SpringQueryMap Building building);
 
 
 

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IFloorClient.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import org.springblade.community.entity.Floor;
 import org.springblade.community.vo.FloorVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,7 +25,7 @@ public interface IFloorClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    FloorVO detail(Floor floor);
+    FloorVO detail(@SpringQueryMap Floor floor);
 
 	@GetMapping("/getById")
 	Floor getById(@RequestParam Long id);
@@ -33,7 +34,7 @@ public interface IFloorClient  {
 	 * 查询
 	 */
 	@GetMapping("/list")
-    List<FloorVO> list(Floor floor);
+    List<FloorVO> list(@SpringQueryMap Floor floor);
 
 
 

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IRoomClient.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import org.springblade.community.entity.Room;
 import org.springblade.community.vo.RoomVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,7 +25,7 @@ public interface IRoomClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    RoomVO detail(Room room);
+    RoomVO detail(@SpringQueryMap Room room);
 
 	@GetMapping("/getById")
 	Room getById(@RequestParam Long id);
@@ -32,7 +33,7 @@ public interface IRoomClient  {
 	 * 查询 房间表
 	 */
 	@GetMapping("/list")
-    List<RoomVO> list(Room room);
+    List<RoomVO> list(@SpringQueryMap Room room);
 
 
 

blade-service-api/device-api/src/main/java/org/springblade/device/feign/IIotAlarmClient.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import org.springblade.device.entity.IotAlarm;
 import org.springblade.device.vo.IotAlarmVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,13 +25,13 @@ public interface IIotAlarmClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    IotAlarmVO detail(IotAlarm iotAlarm);
+    IotAlarmVO detail(@SpringQueryMap IotAlarm iotAlarm);
 
 	/**
 	 * 查询 设备告警
 	 */
 	@GetMapping("/list")
-    List<IotAlarmVO> list(IotAlarm iotAlarm);
+    List<IotAlarmVO> list(@SpringQueryMap IotAlarm iotAlarm);
 
 
 
@@ -52,12 +53,12 @@ public interface IIotAlarmClient  {
 	@PostMapping("/submit")
     boolean submit(@Valid @RequestBody IotAlarm iotAlarm);
 
-	
+
 	/**
 	 * 删除 设备告警
 	 */
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
-	
+
 }

blade-service-api/device-api/src/main/java/org/springblade/device/feign/IIotAlarmGroupUserClient.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import org.springblade.device.entity.IotAlarmGroupUser;
 import org.springblade.device.vo.IotAlarmGroupUserVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,13 +25,13 @@ public interface IIotAlarmGroupUserClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    IotAlarmGroupUserVO detail(IotAlarmGroupUser iotAlarmGroupUser);
+    IotAlarmGroupUserVO detail(@SpringQueryMap IotAlarmGroupUser iotAlarmGroupUser);
 
 	/**
 	 * 查询 告警分组和用户关联表
 	 */
 	@GetMapping("/list")
-    List<IotAlarmGroupUserVO> list(IotAlarmGroupUser iotAlarmGroupUser);
+    List<IotAlarmGroupUserVO> list(@SpringQueryMap IotAlarmGroupUser iotAlarmGroupUser);
 
 
 
@@ -52,12 +53,12 @@ public interface IIotAlarmGroupUserClient  {
 	@PostMapping("/submit")
     boolean submit(@Valid @RequestBody IotAlarmGroupUser iotAlarmGroupUser);
 
-	
+
 	/**
 	 * 删除 告警分组和用户关联表
 	 */
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
-	
+
 }

blade-service-api/device-api/src/main/java/org/springblade/device/feign/IIotDeviceDetailClient.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import org.springblade.device.entity.IotDeviceDetail;
 import org.springblade.device.vo.IotDeviceDetailVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,40 +25,40 @@ public interface IIotDeviceDetailClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    IotDeviceDetailVO detail(IotDeviceDetail iotDeviceDetail);
+    IotDeviceDetailVO detail(@SpringQueryMap IotDeviceDetail iotDeviceDetail);
 
 	/**
-	 * 查询 
+	 * 查询
 	 */
 	@GetMapping("/list")
-    List<IotDeviceDetailVO> list(IotDeviceDetail iotDeviceDetail);
+    List<IotDeviceDetailVO> list(@SpringQueryMap IotDeviceDetail iotDeviceDetail);
 
 
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	boolean save(@Valid @RequestBody IotDeviceDetail iotDeviceDetail);
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
     boolean update(@Valid @RequestBody IotDeviceDetail iotDeviceDetail);
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
     boolean submit(@Valid @RequestBody IotDeviceDetail iotDeviceDetail);
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
-	
+
 }

blade-service-api/device-api/src/main/java/org/springblade/device/feign/IIotDeviceHeartbeatClient.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import org.springblade.device.entity.IotDeviceHeartbeat;
 import org.springblade.device.vo.IotDeviceHeartbeatVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,13 +25,13 @@ public interface IIotDeviceHeartbeatClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    IotDeviceHeartbeatVO detail(IotDeviceHeartbeat iotDeviceHeartbeat);
+    IotDeviceHeartbeatVO detail(@SpringQueryMap IotDeviceHeartbeat iotDeviceHeartbeat);
 
 	/**
 	 * 查询 设备告警
 	 */
 	@GetMapping("/list")
-    List<IotDeviceHeartbeatVO> list(IotDeviceHeartbeat iotDeviceHeartbeat);
+    List<IotDeviceHeartbeatVO> list(@SpringQueryMap IotDeviceHeartbeat iotDeviceHeartbeat);
 
 
 
@@ -52,12 +53,12 @@ public interface IIotDeviceHeartbeatClient  {
 	@PostMapping("/submit")
     boolean submit(@Valid @RequestBody IotDeviceHeartbeat iotDeviceHeartbeat);
 
-	
+
 	/**
 	 * 删除 设备告警
 	 */
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
-	
+
 }

blade-service-api/device-api/src/main/java/org/springblade/device/feign/IVideoCloudDeviceClient.java

@@ -8,6 +8,7 @@ import org.springblade.device.dto.VideoCloudDeviceDTO;
 import org.springblade.device.entity.VideoCloudDevice;
 import org.springblade.device.vo.VideoCloudDeviceVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -27,13 +28,13 @@ public interface IVideoCloudDeviceClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    VideoCloudDeviceVO detail(VideoCloudDevice videoCloudDevice);
+    VideoCloudDeviceVO detail(@SpringQueryMap VideoCloudDevice videoCloudDevice);
 
 	/**
 	 * 查询
 	 */
 	@GetMapping("/list")
-    List<VideoCloudDeviceVO> list(VideoCloudDevice videoCloudDevice);
+    List<VideoCloudDeviceVO> list(@SpringQueryMap VideoCloudDevice videoCloudDevice);
 
 	/**
 	 * 查询

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/feign/IDeptClient.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import org.springblade.enterprise.entity.EnterpriseDept;
 import org.springblade.enterprise.vo.DeptVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,13 +25,13 @@ public interface IDeptClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    DeptVO detail(EnterpriseDept dept);
+    DeptVO detail(@SpringQueryMap EnterpriseDept dept);
 
 	/**
 	 * 查询
 	 */
 	@GetMapping("/list")
-    List<DeptVO> list(EnterpriseDept dept);
+    List<DeptVO> list(@SpringQueryMap EnterpriseDept dept);
 
 
 

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/feign/IEnterpriseClient.java

@@ -7,6 +7,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.enterprise.entity.Enterprise;
 import org.springblade.enterprise.vo.EnterpriseVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,7 +28,7 @@ public interface IEnterpriseClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    EnterpriseVO detail(Enterprise enterprise);
+    EnterpriseVO detail(@SpringQueryMap Enterprise enterprise);
 
 
 	/**
@@ -39,7 +40,7 @@ public interface IEnterpriseClient  {
 	 * 查询
 	 */
 	@GetMapping("/list")
-    List<EnterpriseVO> list(Enterprise enterprise);
+    List<EnterpriseVO> list(@SpringQueryMap Enterprise enterprise);
 
 	/**
 	 * 新增

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/feign/IProjectClient.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import org.springblade.enterprise.entity.Project;
 import org.springblade.enterprise.vo.ProjectVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,13 +25,13 @@ public interface IProjectClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    ProjectVO detail(Project project);
+    ProjectVO detail(@SpringQueryMap Project project);
 
 	/**
 	 * 查询
 	 */
 	@GetMapping("/list")
-    List<ProjectVO> list(Project project);
+    List<ProjectVO> list(@SpringQueryMap Project project);
 
 
 

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/feign/IStaffClient.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import org.springblade.enterprise.entity.Staff;
 import org.springblade.enterprise.vo.StaffVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,13 +25,13 @@ public interface IStaffClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    StaffVO detail(Staff staff);
+    StaffVO detail(@SpringQueryMap Staff staff);
 
 	/**
 	 * 查询
 	 */
 	@GetMapping("/list")
-    List<StaffVO> list(Staff staff);
+    List<StaffVO> list(@SpringQueryMap Staff staff);
 
 
 

blade-service-api/estate-api/src/main/java/org/springblade/estate/feign/IArticleClient.java

@@ -5,6 +5,7 @@ import org.springblade.estate.dto.ArticleCountDto;
 import org.springblade.estate.entity.Article;
 import org.springblade.estate.vo.ArticleVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,13 +26,13 @@ public interface IArticleClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    ArticleVO detail(Article article);
+    ArticleVO detail(@SpringQueryMap Article article);
 
 	/**
 	 * 查询
 	 */
 	@GetMapping("/list")
-    List<ArticleVO> list(Article article);
+    List<ArticleVO> list(@SpringQueryMap Article article);
 
 
 

blade-service-api/person-api/src/main/java/org/springblade/person/feign/IMemberClient.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import org.springblade.person.entity.Member;
 import org.springblade.person.vo.MemberVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,13 +25,13 @@ public interface IMemberClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    MemberVO detail(Member member);
+    MemberVO detail(@SpringQueryMap Member member);
 
 	/**
 	 * 查询 会员表--小程序端，app端注册的会员信息
 	 */
 	@GetMapping("/list")
-    List<MemberVO> list(Member member);
+    List<MemberVO> list(@SpringQueryMap Member member);
 
 
 

blade-service-api/work-order-api/src/main/java/org/springblade/workorder/deviceorder/feign/IDeviceOrderClient.java

@@ -7,6 +7,7 @@ import org.springblade.workorder.deviceorder.entity.DeviceOrder;
 import org.springblade.workorder.deviceorder.vo.DeviceOrderStatisticsVO;
 import org.springblade.workorder.deviceorder.vo.DeviceOrderVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,13 +28,13 @@ public interface IDeviceOrderClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-	DeviceOrderVO detail(DeviceOrder deviceOrder);
+	DeviceOrderVO detail(@SpringQueryMap DeviceOrder deviceOrder);
 
 	/**
 	 * 查询 设备工单
 	 */
 	@GetMapping("/list")
-    List<DeviceOrderVO> list(DeviceOrder deviceOrder);
+    List<DeviceOrderVO> list(@SpringQueryMap DeviceOrder deviceOrder);
 
 
 

blade-service-api/work-order-api/src/main/java/org/springblade/workorder/publicevent/feign/IPublicEventClient.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import org.springblade.workorder.publicevent.entity.PublicEvent;
 import org.springblade.workorder.publicevent.vo.PublicEventVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,40 +25,40 @@ public interface IPublicEventClient  {
 	 * 详情
 	 */
 	@GetMapping("/detail")
-    PublicEventVO detail(PublicEvent publicEvent);
+    PublicEventVO detail(@SpringQueryMap PublicEvent publicEvent);
 
 	/**
-	 * 查询 
+	 * 查询
 	 */
 	@GetMapping("/list")
-    List<PublicEventVO> list(PublicEvent publicEvent);
+    List<PublicEventVO> list(@SpringQueryMap PublicEvent publicEvent);
 
 
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	boolean save(@Valid @RequestBody PublicEvent publicEvent);
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
     boolean update(@Valid @RequestBody PublicEvent publicEvent);
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
     boolean submit(@Valid @RequestBody PublicEvent publicEvent);
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
-	
+
 }

blade-service/estate/src/main/java/org/springblade/estate/feign/AccessFacePushRecordsClient.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.estate.entity.AccessFacePushRecords;
@@ -33,7 +34,7 @@ public class AccessFacePushRecordsClient implements IAccessFacePushRecordsClient
      */
     @Override
     @GetMapping("/detail")
-    public AccessFacePushRecordsVO detail(AccessFacePushRecords accessFacePushRecords) {
+    public AccessFacePushRecordsVO detail(@SpringQueryMap AccessFacePushRecords accessFacePushRecords) {
         AccessFacePushRecords detail = accessFacePushRecordsService.getOne(Condition.getQueryWrapper(accessFacePushRecords));
         return AccessFacePushRecordsWrapper.build().entityVO(detail);
         }
@@ -47,7 +48,7 @@ public class AccessFacePushRecordsClient implements IAccessFacePushRecordsClient
         return AccessFacePushRecordsWrapper.build().listVO(accessFacePushRecordsService.list(Condition.getQueryWrapper(accessFacePushRecords)));
         }
 
-    
+
 
     /**
      * 新增 出入记录
@@ -76,7 +77,7 @@ public class AccessFacePushRecordsClient implements IAccessFacePushRecordsClient
         return accessFacePushRecordsService.saveOrUpdate(accessFacePushRecords);
         }
 
-    
+
     /**
      * 删除 出入记录
      */
@@ -86,5 +87,5 @@ public class AccessFacePushRecordsClient implements IAccessFacePushRecordsClient
         return accessFacePushRecordsService.deleteLogic(Func.toLongList(ids));
         }
 
-    
+
 }

blade-service/estate/src/main/java/org/springblade/estate/feign/AccessRecordClient.java

@@ -13,6 +13,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.estate.dto.AccessRecordCountDto;
 import org.springblade.system.expand.feign.IConfClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.estate.entity.AccessRecord;
@@ -44,7 +45,7 @@ public class AccessRecordClient implements IAccessRecordClient {
      */
     @Override
     @GetMapping("/detail")
-    public AccessRecordVO detail(AccessRecord accessRecord) {
+    public AccessRecordVO detail(@SpringQueryMap AccessRecord accessRecord) {
         AccessRecord detail = accessRecordService.getOne(Condition.getQueryWrapper(accessRecord));
         return AccessRecordWrapper.build(confClient).entityVO(detail);
         }
@@ -54,7 +55,7 @@ public class AccessRecordClient implements IAccessRecordClient {
      */
     @Override
     @GetMapping("/list")
-    public List<AccessRecordVO> list(AccessRecord accessRecord) {
+    public List<AccessRecordVO> list(@SpringQueryMap AccessRecord accessRecord) {
         return AccessRecordWrapper.build(confClient).listVO(accessRecordService.list(Condition.getQueryWrapper(accessRecord)));
         }
 

blade-service/estate/src/main/java/org/springblade/estate/feign/ApplyUserClient.java

@@ -13,6 +13,7 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.estate.dto.ApplyUserDTO;
 import org.springblade.system.expand.feign.IConfClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.estate.entity.ApplyUser;
@@ -43,7 +44,7 @@ public class ApplyUserClient implements IApplyUserClient {
      */
     @Override
     @GetMapping("/detail")
-    public ApplyUserVO detail(ApplyUser applyUser) {
+    public ApplyUserVO detail(@SpringQueryMap ApplyUser applyUser) {
         ApplyUser detail = applyUserService.getOne(Condition.getQueryWrapper(applyUser));
 		String filePrefix = confClient.getValueByToken(ConfConstant.FILE_SERVER_HOST);
         return ApplyUserWrapper.build(confClient).entityVO(detail);
@@ -60,7 +61,7 @@ public class ApplyUserClient implements IApplyUserClient {
      */
     @Override
     @GetMapping("/list")
-    public List<ApplyUserVO> list(ApplyUser applyUser) {
+    public List<ApplyUserVO> list(@SpringQueryMap ApplyUser applyUser) {
 
 		String filePrefix = confClient.getValueByToken(ConfConstant.FILE_SERVER_HOST);
         return ApplyUserWrapper.build(confClient).listVO(applyUserService.list(Condition.getQueryWrapper(applyUser)));

blade-service/estate/src/main/java/org/springblade/estate/feign/ArticleClient.java

@@ -7,6 +7,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.estate.dto.AccessRecordCountDto;
 import org.springblade.estate.dto.ArticleCountDto;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.estate.entity.Article;
@@ -35,7 +36,7 @@ public class ArticleClient implements IArticleClient {
      */
     @Override
     @GetMapping("/detail")
-    public ArticleVO detail(Article article) {
+    public ArticleVO detail(@SpringQueryMap Article article) {
         Article detail = articleService.getOne(Condition.getQueryWrapper(article));
         return ArticleWrapper.build().entityVO(detail);
         }
@@ -45,7 +46,7 @@ public class ArticleClient implements IArticleClient {
      */
     @Override
     @GetMapping("/list")
-    public List<ArticleVO> list(Article article) {
+    public List<ArticleVO> list(@SpringQueryMap Article article) {
         return ArticleWrapper.build().listVO(articleService.list(Condition.getQueryWrapper(article)));
         }
 

blade-service/estate/src/main/java/org/springblade/estate/feign/CarOutRecordClient.java

@@ -8,6 +8,7 @@ import javax.validation.Valid;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.estate.entity.CarOutRecord;
@@ -39,7 +40,7 @@ public class CarOutRecordClient implements ICarOutRecordClient {
      */
     @Override
     @GetMapping("/detail")
-    public CarOutRecordVO detail(CarOutRecord carOutRecord) {
+    public CarOutRecordVO detail(@SpringQueryMap CarOutRecord carOutRecord) {
         CarOutRecord detail = carOutRecordService.getOne(Condition.getQueryWrapper(carOutRecord));
         return CarOutRecordWrapper.build().entityVO(detail);
         }
@@ -49,7 +50,7 @@ public class CarOutRecordClient implements ICarOutRecordClient {
      */
     @Override
     @GetMapping("/list")
-    public List<CarOutRecordVO> list(CarOutRecord carOutRecord) {
+    public List<CarOutRecordVO> list(@SpringQueryMap CarOutRecord carOutRecord) {
         return CarOutRecordWrapper.build().listVO(carOutRecordService.list(Condition.getQueryWrapper(carOutRecord)));
         }
 

blade-service/estate/src/main/java/org/springblade/estate/feign/FeedbackClient.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.estate.entity.Feedback;
@@ -33,24 +34,24 @@ public class FeedbackClient implements IFeedbackClient {
      */
     @Override
     @GetMapping("/detail")
-    public FeedbackVO detail(Feedback feedback) {
+    public FeedbackVO detail(@SpringQueryMap Feedback feedback) {
         Feedback detail = feedbackService.getOne(Condition.getQueryWrapper(feedback));
         return FeedbackWrapper.build().entityVO(detail);
         }
 
     /**
-     * 查询 
+     * 查询
      */
     @Override
     @GetMapping("/list")
-    public List<FeedbackVO> list(Feedback feedback) {
+    public List<FeedbackVO> list(@SpringQueryMap Feedback feedback) {
         return FeedbackWrapper.build().listVO(feedbackService.list(Condition.getQueryWrapper(feedback)));
         }
 
-    
+
 
     /**
-     * 新增 
+     * 新增
      */
     @Override
     @PostMapping("/save")
@@ -59,7 +60,7 @@ public class FeedbackClient implements IFeedbackClient {
         }
 
     /**
-     * 修改 
+     * 修改
      */
     @Override
     @PostMapping("/update")
@@ -68,7 +69,7 @@ public class FeedbackClient implements IFeedbackClient {
         }
 
     /**
-     * 新增或修改 
+     * 新增或修改
      */
     @Override
     @PostMapping("/submit")
@@ -76,9 +77,9 @@ public class FeedbackClient implements IFeedbackClient {
         return feedbackService.saveOrUpdate(feedback);
         }
 
-    
+
     /**
-     * 删除 
+     * 删除
      */
     @Override
     @PostMapping("/remove")
@@ -86,5 +87,5 @@ public class FeedbackClient implements IFeedbackClient {
         return feedbackService.deleteLogic(Func.toLongList(ids));
         }
 
-    
+
 }

blade-service/estate/src/main/java/org/springblade/estate/feign/GuestRecordRecordClient.java

@@ -13,6 +13,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.estate.dto.GuestRecordDTO;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.estate.entity.GuestRecord;
@@ -42,7 +43,7 @@ public class GuestRecordRecordClient implements IGuestRecordClient {
      */
     @Override
     @GetMapping("/detail")
-    public GuestRecordVO detail(GuestRecord guestRecord) {
+    public GuestRecordVO detail(@SpringQueryMap GuestRecord guestRecord) {
         GuestRecord detail = guestService.getOne(Condition.getQueryWrapper(guestRecord));
         return GuestWrapper.build().entityVO(detail);
         }
@@ -52,7 +53,7 @@ public class GuestRecordRecordClient implements IGuestRecordClient {
      */
     @Override
     @GetMapping("/list")
-    public List<GuestRecordVO> list(GuestRecord guestRecord) {
+    public List<GuestRecordVO> list(@SpringQueryMap GuestRecord guestRecord) {
         return GuestWrapper.build().listVO(guestService.list(Condition.getQueryWrapper(guestRecord)));
         }
 

blade-service/estate/src/main/java/org/springblade/estate/feign/NoticeClient.java

@@ -9,6 +9,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.estate.dto.NoticeDTO;
 import org.springblade.estate.entity.NoticePushRecord;
 import org.springblade.estate.service.INoticePushRecordService;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.estate.entity.Notice;
@@ -38,7 +39,7 @@ public class NoticeClient implements INoticeClient {
      */
     @Override
     @GetMapping("/detail")
-    public NoticeVO detail(Notice notice) {
+    public NoticeVO detail(@SpringQueryMap Notice notice) {
         Notice detail = noticeService.getOne(Condition.getQueryWrapper(notice));
         return NoticeWrapper.build().entityVO(detail);
         }
@@ -48,7 +49,7 @@ public class NoticeClient implements INoticeClient {
      */
     @Override
     @GetMapping("/list")
-    public List<NoticeVO> list(Notice notice) {
+    public List<NoticeVO> list(@SpringQueryMap Notice notice) {
         return NoticeWrapper.build().listVO(noticeService.list(Condition.getQueryWrapper(notice)));
         }
 

blade-service/estate/src/main/java/org/springblade/estate/feign/NoticePushRecordClient.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.estate.entity.NoticePushRecord;
@@ -33,24 +34,24 @@ public class NoticePushRecordClient implements INoticePushRecordClient {
      */
     @Override
     @GetMapping("/detail")
-    public NoticePushRecordVO detail(NoticePushRecord noticePushRecord) {
+    public NoticePushRecordVO detail(@SpringQueryMap NoticePushRecord noticePushRecord) {
         NoticePushRecord detail = noticePushRecordService.getOne(Condition.getQueryWrapper(noticePushRecord));
         return NoticePushRecordWrapper.build().entityVO(detail);
         }
 
     /**
-     * 查询 
+     * 查询
      */
     @Override
     @GetMapping("/list")
-    public List<NoticePushRecordVO> list(NoticePushRecord noticePushRecord) {
+    public List<NoticePushRecordVO> list(@SpringQueryMap NoticePushRecord noticePushRecord) {
         return NoticePushRecordWrapper.build().listVO(noticePushRecordService.list(Condition.getQueryWrapper(noticePushRecord)));
         }
 
-    
+
 
     /**
-     * 新增 
+     * 新增
      */
     @Override
     @PostMapping("/save")
@@ -59,7 +60,7 @@ public class NoticePushRecordClient implements INoticePushRecordClient {
         }
 
     /**
-     * 修改 
+     * 修改
      */
     @Override
     @PostMapping("/update")
@@ -68,7 +69,7 @@ public class NoticePushRecordClient implements INoticePushRecordClient {
         }
 
     /**
-     * 新增或修改 
+     * 新增或修改
      */
     @Override
     @PostMapping("/submit")
@@ -76,9 +77,9 @@ public class NoticePushRecordClient implements INoticePushRecordClient {
         return noticePushRecordService.saveOrUpdate(noticePushRecord);
         }
 
-    
+
     /**
-     * 删除 
+     * 删除
      */
     @Override
     @PostMapping("/remove")
@@ -86,5 +87,5 @@ public class NoticePushRecordClient implements INoticePushRecordClient {
         return noticePushRecordService.deleteLogic(Func.toLongList(ids));
         }
 
-    
+
 }

blade-service/estate/src/main/java/org/springblade/estate/feign/ParkingSpaceClient.java

@@ -9,6 +9,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.expand.feign.IOrgPositionClient;
 import org.springblade.system.expand.util.QueryWrapperUtil;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.estate.entity.ParkingSpace;
@@ -38,7 +39,7 @@ public class ParkingSpaceClient implements IParkingSpaceClient {
      */
     @Override
     @GetMapping("/detail")
-    public ParkingSpaceVO detail(ParkingSpace parkingSpace) {
+    public ParkingSpaceVO detail(@SpringQueryMap ParkingSpace parkingSpace) {
         ParkingSpace detail = parkingSpaceService.getOne(Condition.getQueryWrapper(parkingSpace));
         return ParkingSpaceWrapper.build().entityVO(detail);
         }
@@ -48,7 +49,7 @@ public class ParkingSpaceClient implements IParkingSpaceClient {
      */
     @Override
     @GetMapping("/list")
-    public List<ParkingSpaceVO> list(ParkingSpace parkingSpace) {
+    public List<ParkingSpaceVO> list(@SpringQueryMap ParkingSpace parkingSpace) {
 		LambdaQueryWrapper<ParkingSpace> queryWrapper = new QueryWrapperUtil<ParkingSpace>().getBasicQueryWrapper(ParkingSpace::getOrgPosition, parkingSpace, AuthUtil.getUser(), orgPositionClient);
 		return ParkingSpaceWrapper.build().listVO(parkingSpaceService.list(queryWrapper));
         }

blade-service/estate/src/main/java/org/springblade/estate/feign/PratiqueClient.java

@@ -12,6 +12,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.estate.dto.PratiqueDTO;
 import org.springblade.estate.dto.RepairDTO;
 import org.springblade.estate.entity.Repair;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.estate.entity.Pratique;
@@ -40,7 +41,7 @@ public class PratiqueClient implements IPratiqueClient {
      */
     @Override
     @GetMapping("/detail")
-    public PratiqueVO detail(Pratique pratique) {
+    public PratiqueVO detail(@SpringQueryMap Pratique pratique) {
         Pratique detail = pratiqueService.getOne(Condition.getQueryWrapper(pratique));
         return PratiqueWrapper.build().entityVO(detail);
         }
@@ -50,7 +51,7 @@ public class PratiqueClient implements IPratiqueClient {
      */
     @Override
     @GetMapping("/list")
-    public List<PratiqueVO> list(Pratique pratique) {
+    public List<PratiqueVO> list(@SpringQueryMap Pratique pratique) {
         return PratiqueWrapper.build().listVO(pratiqueService.list(Condition.getQueryWrapper(pratique)));
         }
 

blade-service/system-expand/src/main/java/org/springblade/system/expand/feign/OrgPositionClient.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.system.expand.entity.OrgPosition;
@@ -33,24 +34,24 @@ public class OrgPositionClient implements IOrgPositionClient {
      */
     @Override
     @GetMapping("/detail")
-    public OrgPositionVO detail(OrgPosition orgPosition) {
+    public OrgPositionVO detail(@SpringQueryMap OrgPosition orgPosition) {
         OrgPosition detail = orgPositionService.getOne(Condition.getQueryWrapper(orgPosition));
         return OrgPositionWrapper.build().entityVO(detail);
         }
 
     /**
-     * 查询 
+     * 查询
      */
     @Override
     @GetMapping("/list")
-    public List<OrgPositionVO> list(OrgPosition orgPosition) {
+    public List<OrgPositionVO> list(@SpringQueryMap OrgPosition orgPosition) {
         return OrgPositionWrapper.build().listVO(orgPositionService.list(Condition.getQueryWrapper(orgPosition)));
         }
 
-    
+
 
     /**
-     * 新增 
+     * 新增
      */
     @Override
     @PostMapping("/save")
@@ -59,7 +60,7 @@ public class OrgPositionClient implements IOrgPositionClient {
         }
 
     /**
-     * 修改 
+     * 修改
      */
     @Override
     @PostMapping("/update")
@@ -68,7 +69,7 @@ public class OrgPositionClient implements IOrgPositionClient {
         }
 
     /**
-     * 新增或修改 
+     * 新增或修改
      */
     @Override
     @PostMapping("/submit")
@@ -76,9 +77,9 @@ public class OrgPositionClient implements IOrgPositionClient {
         return orgPositionService.saveOrUpdate(orgPosition);
         }
 
-    
+
     /**
-     * 删除 
+     * 删除
      */
     @Override
     @PostMapping("/remove")
@@ -86,5 +87,5 @@ public class OrgPositionClient implements IOrgPositionClient {
         return orgPositionService.deleteLogic(Func.toLongList(ids));
         }
 
-    
+
 }