Merge remote-tracking branch 'origin/dev' into dev

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/backstage/BgRscpImageDataTotalController.java

@@ -18,10 +18,7 @@ import com.upyuns.platform.rs.datacenter.entity.RscpImagePrice;
 import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -34,7 +31,7 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TR
 public class BgRscpImageDataTotalController extends BaseController<RscpImageDataTotalBiz, RscpImageDataTotal> {
 
     @Override
-    public ObjectRestResponse<PageDataVO<RscpImageDataTotal>> pages(Map<String, Object> params) {
+    public ObjectRestResponse<PageDataVO<RscpImageDataTotal>> pages(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
         return ObjectRestResponse.succ(baseBiz.selectByQueryLogicPage(query));

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/backstage/BgRscpImagePriceController.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -25,7 +26,7 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TR
 public class BgRscpImagePriceController extends BaseController<RscpImagePriceBiz, RscpImagePrice> {
 
     @Override
-    public ObjectRestResponse<PageDataVO<RscpImagePrice>> pages(Map<String, Object> params) {
+    public ObjectRestResponse<PageDataVO<RscpImagePrice>> pages(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
         return ObjectRestResponse.succ(baseBiz.selectByQueryLogicPage(query));

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/backstage/BgRscpResolutionController.java

@@ -10,6 +10,7 @@ import com.upyuns.platform.rs.datacenter.entity.RscpImagePrice;
 import com.upyuns.platform.rs.datacenter.entity.RscpResolution;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -23,7 +24,7 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TR
 public class BgRscpResolutionController extends BaseController<RscpResolutionBiz, RscpResolution> {
 
     @Override
-    public ObjectRestResponse<PageDataVO<RscpResolution>> pages(Map<String, Object> params) {
+    public ObjectRestResponse<PageDataVO<RscpResolution>> pages(@RequestParam Map<String, Object> params) {
         //查询列表数据
         Query query = new Query(params);
         return ObjectRestResponse.succ(baseBiz.selectByQueryLogicPage(query));