Merge branch 'dev_bussiness_layer0726' into 'develop'

参数类型变更int-long

See merge request !283

project-order/src/main/java/com/dituhui/pea/order/controller/BusinessBlockController.java

@@ -27,7 +27,7 @@ public class BusinessBlockController {
 	 */
 	 */
 	@GetMapping("/business/service/block/list")
 	@GetMapping("/business/service/block/list")
 	public Result<?> businessSeverBlocks(@RequestParam String levelType, @RequestParam String levelValue,
 	public Result<?> businessSeverBlocks(@RequestParam String levelType, @RequestParam String levelValue,
-										 @RequestParam int page, @RequestParam int size,
+										 @RequestParam long page, @RequestParam long size,
 										 @RequestParam(required = false) String layerId,
 										 @RequestParam(required = false) String layerId,
 										 @RequestParam(required = false) String teamId) {
 										 @RequestParam(required = false) String teamId) {
 		Result<?> res=null;
 		Result<?> res=null;

project-order/src/main/java/com/dituhui/pea/order/service/BusinessBlockService.java

@@ -4,7 +4,7 @@ import com.dituhui.pea.common.Result;
 
 
 public interface BusinessBlockService {
 public interface BusinessBlockService {
 
 
-	Result<?> businessServerBlocks(String levelType, String levelValue, int page, int size, String layerId, String teamId);
+	Result<?> businessServerBlocks(String levelType, String levelValue, long page, long size, String layerId, String teamId);
 
 
 	Result<?> businessServiceBlockAdd(String layerId, String teamId);
 	Result<?> businessServiceBlockAdd(String layerId, String teamId);
 
 

project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessBlockServiceImpl.java

@@ -36,7 +36,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 	private OrgGroupMPDao orgGroupMPDao;
 	private OrgGroupMPDao orgGroupMPDao;
 
 
 	@Override
 	@Override
-	public Result<?> businessServerBlocks(String levelType, String levelValue, int page, int size, String layerId, String teamId) {
+	public Result<?> businessServerBlocks(String levelType, String levelValue, long page, long size, String layerId, String teamId) {
 		BusinessServerBlocksRespDTO resp = new BusinessServerBlocksRespDTO();
 		BusinessServerBlocksRespDTO resp = new BusinessServerBlocksRespDTO();
 
 
 		LambdaQueryWrapper<OrgTeam> lqwTeam = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<OrgTeam> lqwTeam = new LambdaQueryWrapper<>();