From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
index 0203e62..a7a1eaf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -541,9 +541,11 @@
@GetMapping("/getResourceSharingList")
public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
- @RequestParam(value = "communityId", required = false)String communityId)
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "unitId", required = false)String unitId,
+ @RequestParam(value = "meritId", required = false) String meritId)
{
- return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,null);
+ return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,unitId,meritId);
}
@ApiOperation(value = "资源共享详情", response = NewFightResourceSharingDTO.class)
@@ -721,7 +723,7 @@
{
// item.setCommunityId(getCommunityId()+"");
// item.setUserId(getUserId()+"");
- item.setOrderType("1");
+// item.setOrderType("1");
return newStriveForFeign.orderAddData(item);
}
--
Gitblit v1.7.1