czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
SongZhang 2024-08-19 17:45:09 +08:00
parent d6bbe73d58 2567044da8
commit a90c441988
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoDto.java
View File

@ -186,4 +186,6 @@ public class TbShopInfoDto implements Serializable {
private String districts; private String districts;
private String cities; private String cities;
private String isCustom;
} }

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

@ -244,6 +244,10 @@ public class TbShopInfo implements Serializable {
@ApiModelProperty(value = "区") @ApiModelProperty(value = "区")
private String districts; private String districts;
@Column(name = "is_custom")
@ApiModelProperty(value = "是否允许用户自定义金额")
private String isCustom;
public void copy(TbShopInfo source){ public void copy(TbShopInfo source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(false)); BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(false));
} }