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

eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java

@@ -57,8 +57,7 @@ public class TbShopInfo implements Serializable {
     @ApiModelProperty(value = "商户Id")
     private String merchantId;
 
-    @Column(name = "`shop_name`",nullable = false)
-    @NotBlank
+    @Column(name = "`shop_name`")
     @ApiModelProperty(value = "店铺名称")
     private String shopName;
 
@@ -190,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;
 
@@ -282,6 +280,6 @@ public class TbShopInfo implements Serializable {
     private String paymentQrcode;
 
     public void copy(TbShopInfo source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(false));
+        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
 }