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

rk

3 天以前 28d2b0a2b33c786670f4999e4b634036de2d6883

 server/system_timer/src/main/java/com/doumee/api/timer/QuartzCloudController.java

@@ -3,9 +3,9 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.timer.entity.QuartzJob;
import com.doumee.service.timer.QuartzJobService;