处理冲突

src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java

@@ -197,10 +197,6 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
 
     private TaxPaymentServiceFactory taxPaymentServiceFactory = new TaxPaymentServiceFactory(user);
 
-    private SalarySysConfService getSalarySysConfService(User user) {
-        return ServiceUtil.getService(SalarySysConfServiceImpl.class, user);
-    }
-
     //是否根据税款所属期进行申报
     private final boolean isTaxDeclarationByTaxCycle = "1".equals(getSalarySysConfService(user).getValueByCode(TAX_DECLARATION_DATE_TYPE));