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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 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;
   }

}