Merge branch 'ww' into test

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java

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

@@ -134,6 +134,8 @@ public class TbProduct implements Serializable {
 
     private Integer stockNumber;
 
+    private Integer warnLine = 0;
+
     @Transient
     @TableField(exist = false)
     private int orderCount;
@@ -150,5 +152,4 @@ public class TbProduct implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-
 }

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

@@ -35,8 +35,6 @@ public class TbProductSku implements Serializable {
 
     private String coverImg;
 
-    private Integer warnLine;
-
     private Double weight;
 
     private Float volume;