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

yujian

2020-05-23 dd6a31aae79b35ccf0e006704a4d9e1d950c57d6

 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);



}