feat: 优化2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -2309,37 +2309,37 @@ public class WmScorePackageController {
 	}
 
 
-	/**
-	 * 分配积分列表查询--派工平台
-	 *
-	 * @param page           分页对象
-	 * @param wmScorePackage 积分包
-	 * @return
-	 */
-	@ApiOperation(value = "分页查询", notes = "分页查询")
-	@GetMapping("/getScorePackagePage")
-	public R getScorePackagePage(Page page, WmScorePackage wmScorePackage) {
-		return wmScorePackageService.getScorePackagePage(page, wmScorePackage);
-	}
-
 	// /**
 	//  * 分配积分列表查询--派工平台
 	//  *
+	//  * @param page           分页对象
+	//  * @param wmScorePackage 积分包
+	//  * @return
 	//  */
 	// @ApiOperation(value = "分页查询", notes = "分页查询")
 	// @GetMapping("/getScorePackagePage")
-	// public R getScorePackagePage(@RequestParam(value = "current") Integer current,
-	// 							 @RequestParam(value = "size") Integer size,
-	// 							 @RequestParam(value = "packageType1") Integer packageType1,
-	// 							 @RequestParam(value = "packageType2") Integer packageType2,
-	// 							 @RequestParam(value = "scorePackageName",required = false) String scorePackageName,
-	// 							 @RequestParam(value = "scorePackageStatus",required = false) Integer scorePackageStatus,
-	// 							 @RequestParam(value = "typeid",required = false) String typeId
-	// ) {
-	// 	return wmScorePackageService.getScorePackagePage(new Page<WmScorePackage>(current,size),
-	// 			packageType1,packageType2,scorePackageName,scorePackageStatus,typeId);
+	// public R getScorePackagePage(Page page, WmScorePackage wmScorePackage) {
+	// 	return wmScorePackageService.getScorePackagePage(page, wmScorePackage);
 	// }
 
+	/**
+	 * 分配积分列表查询--派工平台
+	 *
+	 */
+	@ApiOperation(value = "分页查询", notes = "分页查询")
+	@GetMapping("/getScorePackagePage")
+	public R getScorePackagePage(@RequestParam(value = "current") Integer current,
+								 @RequestParam(value = "size") Integer size,
+								 @RequestParam(value = "packageType1") Integer packageType1,
+								 @RequestParam(value = "packageType2") Integer packageType2,
+								 @RequestParam(value = "scorePackageName",required = false) String scorePackageName,
+								 @RequestParam(value = "scorePackageStatus",required = false) Integer scorePackageStatus,
+								 @RequestParam(value = "typeid",required = false) String typeId
+	) {
+		return wmScorePackageService.getScorePackagePage(new Page<WmScorePackage>(current,size),
+				packageType1,packageType2,scorePackageName,scorePackageStatus,typeId);
+	}
+
 	/**
 	 * 根据id查询积分包信息
 	 *