Merge remote-tracking branch 'origin/develop' into develop

src/main/java/au/com/royalpay/payment/manage/risk/core/impl/RiskMerchantServiceImpl.java

@@ -53,6 +53,8 @@ public class RiskMerchantServiceImpl implements RiskMerchantService {
         detail.put("auditor_id", account.getString("manager_id"));
         detail.put("create_time", new Date());
         riskMerchantDetailLogMapper.save(detail);
+        record.put("status",2);
+        riskMerchantRecordMapper.update(record);
     }
 
     @Override

src/main/java/au/com/royalpay/payment/manage/risk/web/RiskController.java

@@ -78,7 +78,7 @@ public class RiskController {
 
     @RequestMapping(value = "/records/uploadFiles", method = RequestMethod.POST)
     public void addRecordLog(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,@RequestBody AddRiskDetailLog addRiskDetailLog) {
-        riskMerchantService.addDetailLog(addRiskDetailLog,manager);
+//        riskMerchantService.addDetailLog(addRiskDetailLog,manager);
     }
 
     @RequestMapping(value = "/details", method = RequestMethod.GET)