Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-27 fdc8b22740924b634162bcced4d014846a64c0a6

 WebService/src/main/java/com/java110/web/components/fee/PropertyPayComponent.java

@@ -1,8 +1,8 @@
package com.java110.web.components.fee;

import com.java110.common.constant.FeeTypeConstant;
import com.java110.core.context.IPageData;
import com.java110.web.smo.IFeeServiceSMO;
import com.java110.web.smo.feeConfig.IListFeeConfigsSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
@@ -21,8 +21,11 @@
    @Autowired
    private IFeeServiceSMO feeServiceSMOImpl;

    @Autowired
    private IListFeeConfigsSMO listFeeConfigsSMOImpl;

    public ResponseEntity<String> loadPropertyConfigData(IPageData pd) {
        return feeServiceSMOImpl.loadPropertyConfigFee(pd, "");
        return listFeeConfigsSMOImpl.listFeeConfigs(pd);
    }