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 test

This commit is contained in:
张松 2024-11-19 11:37:17 +08:00
parent ffde65a731 e8dd3778ac
commit 7a32c3b198
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java
View File

@ -113,8 +113,12 @@ public class TbProduct implements Serializable {
@ApiModelProperty(value = "是否热销") @ApiModelProperty(value = "是否热销")
private Integer isHot = 0; private Integer isHot = 0;
@Column(name = "`type`")
@ApiModelProperty(value = "商品类型（属性）:普通商品 normal 套餐商品 package 称重商品 weigh 团购券 coupon")
private String type;
@Column(name = "`type_enum`") @Column(name = "`type_enum`")
@ApiModelProperty(value = "商品规格：0-单规格 1多规格") @ApiModelProperty(value = "商品规格：normal-单规格 sku-多规格")
private String typeEnum; private String typeEnum;
@Column(name = "`is_del`",nullable = false) @Column(name = "`is_del`",nullable = false)