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

yj

2020-03-13 1da0cccd804b441ac94a35f28a2ed23a6a7062cc

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

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

   

   // 分享时间

   @Expose

   private Long shareTime;