Merge remote-tracking branch 'remotes/origin/dev_abandon_grid' into 主线开发

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java

@@ -225,7 +225,7 @@ public class BadgeController {
 	 */
 	@PostMapping("deleteBadgeCertificateAuditing")
 	public Result<Integer> deleteBadgeCertificateAuditing(@RequestParam("customerId") String customerId,@RequestParam("gridId")String gridId){
-		return new Result<Boolean>().ok(badgeService.deleteBadgeCertificateAuditing(customerId,gridId));
+		return new Result<Integer>().ok(badgeService.deleteBadgeCertificateAuditing(customerId,gridId));
 	}
 
 }