Merge branch 'refs/heads/share-stock' into dev

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

@@ -316,6 +316,10 @@ public class TbProduct implements Serializable {
     @ApiModelProperty(value = "团购卷分类Id")
     private String groupCategoryId;
 
+    @Column(name = "stock_number")
+    @ApiModelProperty("库存数量")
+    private Integer stockNumber;
+
 
     public void copy(TbProduct source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java

@@ -135,4 +135,8 @@ public class TbProductSku implements Serializable {
     public void copy(TbProductSku source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
+
+    @Column(name = "`is_pause_sale`")
+    @ApiModelProperty(value = "是否暂停销售")
+    private Integer isPauseSale = 0;
 }