Merge remote-tracking branch 'frps/master' into frp-master

# Conflicts:
#	bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml

bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java

@@ -1020,8 +1020,7 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
                 }
 
                 // 修改slt_agreement_info的结算状态
-                int countThree = sltAgreementInfoMapper.updateSltInfoByAgreementIdType(
-                        new SltAgreementInfo()
+                int countThree = sltAgreementInfoMapper.updateSltInfoByAgreementIdType(new SltAgreementInfo()
                                 .setAgreementId(sltAgreementApply.getAgreementId())
                                 .setSettlementType(sltAgreementApplyFromDb.getSettlementType())
                 );
@@ -1031,8 +1030,7 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
                 }
 
                 // 修改未退还设备状态为丢失
-                int countFour = sltAgreementInfoMapper.updateMaStatusLoseByAgreementIdType(
-                        new SltAgreementInfo()
+                int countFour = sltAgreementInfoMapper.updateMaStatusLoseByAgreementIdType(new SltAgreementInfo()
                                 .setAgreementId(sltAgreementApply.getAgreementId())
                                 .setSettlementType(sltAgreementApplyFromDb.getSettlementType())
                 );