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

admin

2020-03-12 7a40d9ca41da29aee9464f545e10b452a1922c32

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

@@ -24,6 +24,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;
   }

}