Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

 src/main/java/org/springblade/modules/directive/service/DirectiveService.java

@@ -42,4 +42,11 @@
    * @return
    */
   int deleleByDirectiveId(Long id);

   /**
    * 自定义分页--接收到的指令
    * @param page,size
    * @param directive 指令对象
    */
   IPage<DirectiveVo> selectDirectiveReplyPage(IPage<DirectiveVo> page, DirectiveVo directive);
}