diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoDto.java index 59d5ca08..8560fec3 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoDto.java @@ -188,4 +188,8 @@ public class TbShopInfoDto implements Serializable { private String cities; private String isCustom; + + private String isReturn; + private String isMemberIn; + private String isMemberReturn; } \ No newline at end of file diff --git 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 index a1b6e21b..5f8a7944 100644 --- 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 @@ -248,6 +248,24 @@ public class TbShopInfo implements Serializable { @ApiModelProperty(value = "是否允许用户自定义金额") private String isCustom; + + @Column(name = "is_return") + @ApiModelProperty(value = "是否允许用户自定义金额") + private String isReturn; + + + @Column(name = "is_member_in") + @ApiModelProperty(value = "是否允许用户自定义金额") + private String isMemberIn; + + + @Column(name = "is_member_return") + @ApiModelProperty(value = "是否允许用户自定义金额") + private String isMemberReturn; + + + + public void copy(TbShopInfo source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(false)); }