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

yujian

2020-06-11 a69ec998d9fe8fa8ea6c40175bebc4e53a227d5b

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

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

   

   // 分享时间

   @Expose

   private Long shareTime;