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

admin

2020-06-29 be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9

 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushGoodsService.java

@@ -15,7 +15,7 @@


   public int insertSelective(PushGoods record) throws PushGoodsException;



   public PushGoods selectByPrimaryKey(Long id) throws PushGoodsException;

   public PushGoods selectByPrimaryKey(Long id);



   public int updateByPrimaryKeySelective(PushGoods record) throws PushGoodsException;