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

admin

2020-04-28 061e912ff3cec51f8f8dcb4e6336bcd2fc03c164

 fanli/src/main/java/com/yeshi/fanli/entity/bus/share/UserShareGoodsRecord.java

@@ -67,6 +67,7 @@
   private Date updateTime;

   

   // 分享时间

   @Expose

   private Long shareTime;