Merge branch 'dev' into dev-new-houpn

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/GoodsCartController.java

@@ -38,7 +38,7 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-@Api(tags = "销售单接口")
+@Api(tags = "销售单接口(废弃)")
 @RequestMapping(value = "/hiver/app/cart/")
 @Transactional
 public class GoodsCartController {

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/GoodsCategoryController.java

@@ -24,7 +24,7 @@ import java.util.List;
 
 @Slf4j
 @RestController
-@Api(tags = "商品分类接口")
+@Api(tags = "商品分类接口(废弃)")
 @RequestMapping(value = "/hiver/app/category/")
 @Transactional
 public class GoodsCategoryController {

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Product.java

@@ -1,12 +1,16 @@
 package cc.hiver.mall.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 @ApiModel(value = "货品表")
+@Table(name = "t_product")
+@TableName(value = "t_product", autoResultMap = true)
 public class Product implements Serializable {
     private Long id;
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttribute.java

@@ -1,11 +1,15 @@
 package cc.hiver.mall.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
 @ApiModel(value = "货品属性")
+@Table(name = "t_product_attribute ")
+@TableName(value = "t_product_attribute ", autoResultMap = true)
 public class ProductAttribute implements Serializable {
     private Long id;
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductAttributeValue.java

@@ -1,11 +1,15 @@
 package cc.hiver.mall.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
 @ApiModel(value = "货品规格表")
+@Table(name = "t_product_attribute_value ")
+@TableName(value = "t_product_attribute_value ", autoResultMap = true)
 public class ProductAttributeValue implements Serializable {
     private Long id;
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductCategory.java

@@ -1,11 +1,15 @@
 package cc.hiver.mall.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
 @ApiModel(value = "货品分类表")
+@Table(name = "t_product_category")
+@TableName(value = "t_product_category", autoResultMap = true)
 public class ProductCategory implements Serializable {
     private Long id;
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Purchase.java

@@ -1,12 +1,16 @@
 package cc.hiver.mall.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 @ApiModel(value = "采购入库单主表")
+@Table(name = "t_purchase ")
+@TableName(value = "t_purchase ", autoResultMap = true)
 public class Purchase implements Serializable {
     private Long id;
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseDetail.java

@@ -1,12 +1,16 @@
 package cc.hiver.mall.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 @ApiModel(value = "采购入库单明细表")
+@Table(name = "t_purchase_detail ")
+@TableName(value = "t_purchase_detail ", autoResultMap = true)
 public class PurchaseDetail implements Serializable {
     private Long id;
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Sale.java

@@ -1,12 +1,16 @@
 package cc.hiver.mall.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 @ApiModel(value = "销售单主表")
+@Table(name = "t_sale")
+@TableName(value = "t_sale", autoResultMap = true)
 public class Sale implements Serializable {
     private Long id;
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetail.java

@@ -1,12 +1,16 @@
 package cc.hiver.mall.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 @ApiModel(value = "销售单明细表")
+@Table(name = "t_sale_detail")
+@TableName(value = "t_sale_detail", autoResultMap = true)
 public class SaleDetail implements Serializable {
     private Long id;
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Stock.java

@@ -1,12 +1,16 @@
 package cc.hiver.mall.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 @ApiModel(value = "商品实时库存表")
+@Table(name = "t_stock")
+@TableName(value = "t_stock", autoResultMap = true)
 public class Stock implements Serializable {
     private Long id;
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/StockLog.java

@@ -1,12 +1,16 @@
 package cc.hiver.mall.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 @ApiModel(value = "商品库存履历表")
+@Table(name = "t_stock_log")
+@TableName(value = "t_stock_log", autoResultMap = true)
 public class StockLog implements Serializable {
     private Long id;