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

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java

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

@@ -51,6 +51,7 @@ public class TbOrderDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private Integer isMember;
+    private Integer isTemporary;
     private Integer isThirdCoupon;
 
 }