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

eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPlussShopStaff.java

@@ -57,6 +57,10 @@ public class TbPlussShopStaff implements Serializable {
     @ApiModelProperty(value = "密码")
     private String password;
 
+    @Column(name = "`discount_type`")
+    @ApiModelProperty(value = "优惠类型 1 折扣 0 金额")
+    private String discountType;
+
     @Column(name = "`max_discount_amount`")
     @ApiModelProperty(value = "最大优惠金额")
     private BigDecimal maxDiscountAmount;