Merge remote-tracking branch 'origin/master'

This commit is contained in:
majintao
2024-11-21 10:06:49 +08:00
@@ -1079,6 +1079,10 @@ public class EvaluationServiceImpl implements EvaluationService {
if (evaluation != null && evaluation.getAvgPrice2b() != null && evaluation.getAvgPrice2b() > 0) {
avgPrice = evaluation.getAvgPrice2b().intValue();
}
// 可能存在evaluation.getAvgPrice2b为空情况
if (stat.getAvgPrice2b() > 0) {
avgPrice = stat.getAvgPrice2b();
}
}
}