Merge branch 'ww' into test

2024-09-12 10:31:53 +08:00
parent 0a3b50ef6f baa9c6c260
commit d2d5c10b0e
1 changed files with 1 additions and 2 deletions
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
@@ -189,8 +189,7 @@ public class TbShopInfo implements Serializable {
    @ApiModelProperty(value = "到期时间")
    private Long expireAt;

-    @Column(name = "`status`",nullable = false)
-    @NotNull
+    @Column(name = "`status`")
    @ApiModelProperty(value = "门店状态")
    private Integer status;