Merge branch 'hotfix' into develop

# Conflicts:
#	src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java

src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java

@@ -89,8 +89,6 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
     private ClientRateMapper clientRateMapper;
     @Resource
     private ClientConfigMapper clientConfigMapper;
-    @Resource
-    private PmtSubMerchantIdMapper pmtSubMerchantIdMapper;
     private ThreadPoolExecutor pool = new ThreadPoolExecutor(1, 10, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
 
 
@@ -346,7 +344,8 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         sysRate.put("active_time", DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
         sysRate.put("expiry_time", DateFormatUtils.format(DateUtils.addYears(new Date(), 1), "yyyy-MM-dd"));
 
-        JSONObject rateConfig = JSONObject.parseObject(sysConfig.getString("sys_rates"));
+
+        JSONObject rateConfig = JSONObject.parseObject(sysConfig.getString("sys_apply_rates"));
         JSONObject chooseRate = new JSONObject();
         if (apply.getIntValue("clean_days") == 1) {
             chooseRate = rateConfig.getJSONObject("t1");