Merge remote-tracking branch 'origin/master'

zhoushihao

3 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java

@@ -33,4 +33,11 @@
     * @return
     */
    boolean overTask(UpPattenUsage sequence, int state);
    /**
     * 获取正在进行中的任务
     *
     * @return
     */
    List<OptimizeProject> getDoingTask();

}