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

2024-11-06 17:14:42 +08:00 · 2024-11-06 17:14:42 +08:00 · 77b9b0c409
parent bd2ed5c8c6 7d2965d8b8
commit 77b9b0c409
1 changed files with 2 additions and 0 deletions
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java
@ -46,6 +46,8 @@ public class TbShopShare extends Model<TbShopShare> {
    //获取方法 get-新用户领取获得 use-新用户使用获得
    private String getMethod;

+    private Integer status;
+
    @TableField(exist = false)
    private List<ShareCoupons> newCoupons;