Merge branch 'master' into pre

netflix-service/src/main/java/com/cyksj/service/distribute/impl/DistributeServiceImpl.java

@@ -383,6 +383,7 @@ public class DistributeServiceImpl implements DistributeService {
 
 	@Override
 	public void setDistributeCommonSkuRate(List<DistributeGeneralSkuRate> skuRates) {
+		generalSkuRateMapper.delete(null);
 		skuRates.forEach(e -> {
 			Integer rate = e.getRate();
 			if (rate == null || rate < 0 || rate > 100) {

netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -807,6 +807,8 @@ public class DistributeController {
 
 		//sku规格比例设置
 		if (CollUtil.isNotEmpty(skuRates)) {
+			//先清空
+			businessDistributeDefaultSkuRateConfigMapper.delete(null);
 			skuRates.forEach(config -> {
 				if (config.getRate() == null) {
 					config.setRate(0);