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

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

@@ -333,6 +333,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                 return budgetLog;
             }).collect(Collectors.toList());
             budgetLogService.updateBatchById(oldLogList4Upd);
+            oldLogList = oldLogList.stream().filter(a->
+                    a.getOptType().equals(BudgetLogOptFlag.State_1.getCode()) || a.getOptType().equals(BudgetLogOptFlag.State_6.getCode())
+            ).collect(Collectors.toList());
             for (TbsBudgetLog budgetLog : oldLogList) {
                 budgetLog.setCreateBy(null);
                 budgetLog.setCreateTime(null);