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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -2037,7 +2037,8 @@ public class ExportServiceImpl implements ExportService {
             	
             	currentFee = row.getServiceFee();
                 
-				if (currentFee == null || currentFee.floatValue() == 0) {
+            	//兼容2022年之前的数据
+				if (currentFee == null || (currentFee.floatValue() == 0 && row.getCreateTime().before(DateUtil.stringToDate("2022-01-01 00:00:00")))) {
 					transferFee = serviceChargeMap.get(row.getOrderNo());
 					if (transferFee == null) {
 						transferFee = BigDecimal.ZERO;