Commit d9bf6056 authored by baoliang's avatar baoliang
Browse files

Merge remote-tracking branch 'upstream/branch-1.0.2' into branch-1.0.2-up

parents 17584a59 ce94add6

escheduler-dao/src/main/java/cn/escheduler/dao/model/ErrorCommand.java

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ public class ErrorCommand { 




    public ErrorCommand(Command command, String message){

        this.id = command.getId();

        this.commandType = command.getCommandType();

        this.executorId = command.getExecutorId();

        this.processDefinitionId = command.getProcessDefinitionId();

escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 
        this._handleDefineUser(res)

        this.isSpin = false

      }).catch(e => {

        this.msg = e.msg || 'error'

        this.isSpin = false

      })

    },

escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  <m-list-construction :title="$t('Project Home')">

    <template slot="content">

      <div class="perject-home-content">

        <div class="time-model" v-show="searchParams.projectId !== 0">

        <div class="time-model">

          <x-datepicker

                  :panel-num="2"

                  placement="bottom-end"