Merge remote-tracking branch 'origin/div' into div

admin

2020-03-14 55b3bd7821f14db9e9441d8b34fb9bdc1a9e4df7

 fanli/src/main/java/com/yeshi/fanli/entity/dynamic/SimpleGoods.java

@@ -23,6 +23,10 @@
   // 状态
   @Expose
   private Integer state;
	
   // 备注
   private String remarks;
		

   public Long getGoodsId() {
      return goodsId;
@@ -64,4 +68,12 @@
      this.state = state;
   }

   public String getRemarks() {
      return remarks;
   }

   public void setRemarks(String remarks) {
      this.remarks = remarks;
   }

}