Merge remote-tracking branch 'origin/master'

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java

@@ -6,6 +6,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * Feign接口类
@@ -33,5 +34,10 @@ public interface IErpMesRbPkpqryClient {
 	 * @return
 	 */
 	@GetMapping(SELECT_PAGE)
-	R<IPage<MesRbPkpqryDTO>> selectPage(Integer current, Integer size, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd);
+	R<IPage<MesRbPkpqryDTO>> selectPage(@RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
+										@RequestParam(value = "size", required = false, defaultValue = "10") Integer size,
+										@RequestParam(value = "pkno", required = false) String pkno,
+										@RequestParam(value = "prtmdept", required = false) String prtmdept,
+										@RequestParam(value = "subpkdateStart", required = false) String subpkdateStart,
+										@RequestParam(value = "subpkdateEnd", required = false) String subpkdateEnd);
 }