zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/zcc'

Browse Source
This commit is contained in:
wangjinlei
2024-04-12 09:45:19 +08:00
parent ce4355d2b1 b507ff6683
commit e338179190
12 changed files with 451 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/common/entity/ShopProductToMedicineLabel.java
View File

@@ -32,7 +32,7 @@ public class ShopProductToMedicineLabel implements Serializable {
@TableField(exist = false)
private ShopProduct product;
@TableField(exist = false)
private ShopProductToMedicineLabel label;
private ShopProductMedicineLabel label;

3
src/main/java/com/peanut/modules/common/entity/ShopProductToMedicineMarket.java
View File

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@@ -32,7 +31,7 @@ public class ShopProductToMedicineMarket implements Serializable {
@TableField(exist = false)
private ShopProduct product;
@TableField(exist = false)
private ShopProductToMedicineMarket market;
private ShopProductMedicineMarket market;