Merge remote-tracking branch 'origin/test' into test

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java

@@ -48,4 +48,6 @@ public class TbOrderDetail implements Serializable {
     private BigDecimal memberPrice;
 
     private static final long serialVersionUID = 1L;
+    private Integer isMember;
+
 }

src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java

@@ -1117,6 +1117,8 @@ public class CartService {
                 orderId = Integer.valueOf(cashierCart.getOrderId());
             }
             orderDetail.setOrderId(orderId);
+            orderDetail.setIsMember(cashierCart.getIsMember());
+
             priceDTO.getOrderDetailList().add(orderDetail);
         }
         return priceDTO;