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

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

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

@@ -100,6 +100,8 @@ public class TbOrderInfo implements Serializable {
 
     private String outNumber;
 
+    private Integer staffId;
+
     private static final long serialVersionUID = 1L;
     public TbOrderInfo(){
         super();

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

@@ -14,6 +14,8 @@ public class TbPlussShopStaff implements Serializable {
 
     private String password;
 
+    private String discountType;
+
     private BigDecimal maxDiscountAmount;
 
     private Boolean status;
@@ -72,6 +74,14 @@ public class TbPlussShopStaff implements Serializable {
         this.password = password == null ? null : password.trim();
     }
 
+    public String getDiscountType() {
+        return discountType;
+    }
+
+    public void setDiscountType(String discountType) {
+        this.discountType = discountType;
+    }
+
     public BigDecimal getMaxDiscountAmount() {
         return maxDiscountAmount;
     }