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

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbActivate.java

@@ -19,6 +19,7 @@ public class TbActivate extends Model<TbActivate> {
     private Integer isUseCoupon;
     //优惠卷id
     private Integer couponId;
+    @TableField(exist = false)
     private String couponName;
     //优惠卷数量
     private Integer num;