conflict

src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java

@@ -100,10 +100,10 @@ public class CustomServiceImpl implements CustomService {
 
     @Override
     public void resend(String report_id) {
-        JSONObject report = customReportsMapper.findOne(report_id);
+//        JSONObject report = customReportsMapper.findOne(report_id);
-        if (report.getIntValue("report_status") != 2) {
+//        if (report.getIntValue("report_status") != 2) {
-            throw new BadRequestException("order can't report");
+//            throw new BadRequestException("order can't report");
-        }
+//        }
         customSupport.sendCustom(report_id);
 
     }