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

admin

2020-02-29 88e78422b773a1a22b7c8f8b6dabdd293f5321d2

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

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

   

   // 分享时间

   @Expose

   private Long shareTime;