Merge branch 'ww' into test

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)
+    @Column(name = "`status`")
-    @NotNull
     @ApiModelProperty(value = "门店状态")
     private Integer status;