Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-27 fdc8b22740924b634162bcced4d014846a64c0a6

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

@@ -2,6 +2,7 @@

import com.java110.core.context.IPageData;
import com.java110.web.smo.IFeeServiceSMO;
import com.java110.web.smo.feeConfig.IListFeeSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
@@ -14,14 +15,17 @@
 * @Version 1.0
 * add by wuxw 2019/6/1
 **/
@Component("viewPropertyFeeConfig")
@Component("viewMainFee")
public class ViewMainFeeComponent {

    @Autowired
    private IFeeServiceSMO feeServiceSMOImpl;

    @Autowired
    private IListFeeSMO listFeeSMOImpl;

    public ResponseEntity<String> getFee(IPageData pd) {
        return feeServiceSMOImpl.loadFeeByRoomId(pd);
        return listFeeSMOImpl.list(pd);
    }