Merge branch 'develop' into feature/form_statistics_05

# Conflicts:
#	backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/scheduler/AdvancePaymentBalanceSumSchedulerTask.java
#	backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/scheduler/AdvancePaymentBalanceSumSchedulerTaskRegister.java

backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/scheduler/AdvancePaymentBalanceSumSchedulerTask.java

@@ -27,7 +27,6 @@ public class AdvancePaymentBalanceSumSchedulerTask implements Task {
 	@Autowired
 	public AdvancePaymentBalanceSumService advancePaymentBalanceSumService;
 
-	@Autowired
 	public SysConfigService sysConfigService;
 
 	@Override
@@ -54,8 +53,9 @@ public class AdvancePaymentBalanceSumSchedulerTask implements Task {
 	}
 
 	private JSONObject getConfig() {
+		sysConfigService = Amino.getApplicationContext().getBean(SysConfigService.class);
 	    Optional<SysConfig> optional = sysConfigService.get("bill", "billAnalyseConfig");
-		if (optional.isPresent()) {
+	    if(optional.isPresent()){
 	      return new JSONObject(optional.get().getValue().toString());
 	    }
 	    return null;