合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-fee/src/main/java/com/java110/fee/bmo/payFeeConfigDiscount/impl/GetPayFeeConfigDiscountBMOImpl.java

@@ -1,7 +1,6 @@
package com.java110.fee.bmo.payFeeConfigDiscount.impl;

import com.java110.dto.feeDiscount.FeeDiscountDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.dto.payFeeConfigDiscount.PayFeeConfigDiscountDto;
import com.java110.fee.bmo.payFeeConfigDiscount.IGetPayFeeConfigDiscountBMO;
import com.java110.intf.fee.IFeeDiscountSpecInnerServiceSMO;
@@ -75,11 +74,9 @@
            for (FeeDiscountSpecDto feeDiscountSpecDto : feeDiscountSpecDtos) {
                if (payFeeConfigDiscountDto.getDiscountId().equals(feeDiscountSpecDto.getDiscountId())) {
                    tmpSpecs.add(feeDiscountSpecDto);

                }
            }
            payFeeConfigDiscountDto.setFeeDiscountSpecs(tmpSpecs);
        }
    }

}