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

yujian

2020-06-29 c2e3dea0d75b7239b1ed66c9d9e1bbb177050858

 fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgExtraService.java

@@ -10,4 +10,11 @@


   public void addMsgExtra(long rid, String content, String type);



   /**

    * 根据上级id类型删除

    * @param rid

    * @param type

    */

   public void deleteByPidAndType(Long rid, String type);



}