diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java index 126e02e1..c4187d96 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java @@ -9,7 +9,6 @@ import net.lab1024.smartadmin.module.system.royalcanin.good.model.GoodsEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.service.GoodService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/GoodsEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/GoodsEntity.java index 9847a95b..4a5c82c3 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/GoodsEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/GoodsEntity.java @@ -8,7 +8,7 @@ import lombok.Data; public class GoodsEntity { private String productName; - private String price; + private String basePrice; private String productCode; @@ -22,9 +22,9 @@ public class GoodsEntity { private String tagUsedAge; - private String slidingPicture; + private String picFile; - private String bodyPicture; + private String showImgFile; private int isSales; diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/good/GoodMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/good/GoodMapper.xml index 7c95a049..b3afae1e 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/good/GoodMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/good/GoodMapper.xml @@ -12,14 +12,14 @@ select product_code, product_name, - price, + base_price, brand_code, brand_name, category_name, pet_type, tagUsedAge, - sliding_picture, - body_picture, + pic_file, + show_img_file, isSales from t_good_goods diff --git a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql index fcd9bed6..547924ba 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql +++ b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql @@ -1654,14 +1654,14 @@ CREATE TABLE `t_good_goods` ( `id` int(11) NOT NULL AUTO_INCREMENT, `product_code` VARCHAR(20) NOT NULL COMMENT '标品编码', `product_name` varchar(20) DEFAULT NULL COMMENT '产品名称', -`price` varchar(11) DEFAULT NULL COMMENT '价格', +`base_price` varchar(11) DEFAULT NULL COMMENT '价格', `brand_code` varchar(11) DEFAULT NULL COMMENT '品牌编码', `brand_name` varchar(11) DEFAULT NULL COMMENT '品牌名称', `category_name` varchar(11) DEFAULT NULL COMMENT '品类', `pet_type` int(11) DEFAULT NULL COMMENT '宠物类型', `tagUsedAge` varchar(11) DEFAULT NULL COMMENT '适用阶段', -`sliding_picture` varchar(200) DEFAULT NULL COMMENT '标品头图', -`body_picture` varchar(200) DEFAULT NULL COMMENT '身体头图', +`pic_file` varchar(200) DEFAULT NULL COMMENT '标品头图', +`show_img_file` varchar(200) DEFAULT NULL COMMENT '身体头图', `isSales` int(11) DEFAULT NULL COMMENT '0:未销售,1:销售', `isShow` int(11) DEFAULT NULL COMMENT '0:不展示,1:展示', PRIMARY KEY (`id`)