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

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -5864,7 +5864,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					zeroFlag = true;
 				}
 			}
-		}else {
+		} else {
 			zeroFlag = true;
 		}
 		DistributionStockupEntity distributionStockupEntity = new DistributionStockupEntity();