Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceDetailResp.java

@@ -91,6 +91,8 @@ public class OrderServiceDetailResp {
      */
      */
     private String multipleOrders;
     private String multipleOrders;
 
 
+    private String beanTags;
+
     @Data
     @Data
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public static class OrderDetail {
     public static class OrderDetail {

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

@@ -93,6 +93,7 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
         res.setIsCutoff(order.getIsCutoff());
         res.setIsCutoff(order.getIsCutoff());
         res.setIsSpecialTime(order.getIsSpecialTime());
         res.setIsSpecialTime(order.getIsSpecialTime());
         res.setMultipleOrders(order.getMultipleOrders());
         res.setMultipleOrders(order.getMultipleOrders());
+        res.setBeanTags(order.getBeanTags());
 
 
         return Result.success(res);
         return Result.success(res);
     }
     }