Merge remote-tracking branch 'origin/master'

admin

2019-06-27 ab9e60fa9a8e43d797446730a5dc9ebfb6b3f4e6

 fanli/src/main/java/com/yeshi/fanli/mapping/share/UserShareGoodsGroupMapper.xml

@@ -147,6 +147,7 @@
   LEFT JOIN `yeshi_ec_share_goods_record` r ON g.`gu_record_id` = r.`sgr_id`
   WHERE  r.sgr_share_state = 1 AND  r.`sgr_source` = #{source}
          AND  g.`gu_common_goods_id` = #{cid} AND r.`sgr_uid` = #{uid}
   ORDER BY g.gu_updatetime desc LIMIT 1
   </select>
   
   <select id="getNewestRecord" resultMap="BaseResultMap">