Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java

@@ -681,6 +681,9 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
         budgetConditions.addAll(buildCategoryCondition(budgetId, seriesIds, TbsGoodsType.series.name()));
         budgetConditions.addAll(buildCategoryCondition(budgetId, categoryIds, TbsGoodsType.category.name()));
         budgetConditions.addAll(buildCategoryCondition(budgetId, brandIds, TbsGoodsType.brand.name()));
+        if(CollectionUtil.isNotEmpty(budgetConditions)) {
+            budgetConditionService.saveBatch(budgetConditions);
+        }
         TbsBudget oriBudget = this.getById(budgetId);
         if (oriBudget.getBudgetState() != 1
                 || oriBudget.getConditionFlag() != 1