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

疯狂的狮子li

2021-07-29 2ef70303c5f1808afd3507ee934b3f32df8e9b3c

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java

@@ -29,7 +29,7 @@
 * @author ruoyi
 */
@Service
public class SysJobServiceImpl extends ServicePlusImpl<SysJobMapper, SysJob> implements ISysJobService {
public class SysJobServiceImpl extends ServicePlusImpl<SysJobMapper, SysJob, SysJob> implements ISysJobService {
    @Autowired
    private Scheduler scheduler;