Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfoEntity.java

@@ -87,7 +87,7 @@ public class OrderInfoEntity {
     private String source;
 
     @Column(name = "bean_priority", length = 10)
-    private String beanPriority;
+    private String beanPriority = "0";
 
     @Column(name = "bean_tags", length = 200)
     private String beanTags;

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerGanttServiceImpl.java

@@ -246,7 +246,7 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
     private String getTags(OrderInfoEntity order) {
         List<String> tagList = new ArrayList();
         if (StringUtils.isNotBlank(order.getBeanTags())) {
-            tagList = Arrays.asList(order.getBeanTags().split(","));
+            tagList = Arrays.stream(order.getBeanTags().split(",")).collect(Collectors.toList());
         }
         if (order.getIsCutoff() == 1) {
             tagList.add(OrderPeaTagsEnum.cutoff.getTag());