Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/settlement/controller/SettlementController.java

@@ -248,7 +248,7 @@ public class SettlementController extends BladeController {
 		lambdaQueryWrapper.lambda().eq(ObjectUtils.isNotNull(settlement.getFinanceStatus()), PjSettlement::getFinanceStatus, settlement.getFinanceStatus());
 		lambdaQueryWrapper.lambda().eq(ObjectUtils.isNotNull(settlement.getSettlementDate()), PjSettlement::getSettlementDate, settlement.getSettlementDate());
 		lambdaQueryWrapper.lambda().eq(PjSettlement::getSalesCompanyId, AuthUtil.getDeptId());
-		lambdaQueryWrapper.lambda().eq(ObjectUtils.isNotNull(settlement.getDc()), PjSettlement::getDc, settlement.getDc());
+		lambdaQueryWrapper.lambda().eq(PjSettlement::getDc, "D");
 		if (ObjectUtils.isNotNull(settlement.getSettlementDateList()) && !settlement.getSettlementDateList().isEmpty()) {
 			lambdaQueryWrapper.lambda().ge(PjSettlement::getSettlementDate, settlement.getSettlementDateList().get(0));
 			lambdaQueryWrapper.lambda().le(PjSettlement::getSettlementDate, settlement.getSettlementDateList().get(1));