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

2024-11-11 14:21:05 +08:00
parent 586bede415 99b755f782
commit 64fd381ed4
1 changed files with 1 additions and 0 deletions
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbActivate.java
+++ b/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;