Merge branch 'master' into 'dev_third_stage'

# Conflicts:
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java

jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue

@@ -31,6 +31,7 @@
           v-if="isDisplay"
           isApprovalOpinion
           :title="titleName"
+          :isSendBack="isSendBackOne"
           ref="examineInformationRef"
           :isSendBack="isSendBackOne"
           :url="url"/>

jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue

@@ -70,6 +70,22 @@
        <span slot="prcType" slot-scope="text,record" :title="prcTypeName[text]">
        {{prcTypeName[text]}}
       </span>
+      <span slot="standard" slot-scope="text,record">
+        <span v-if="record.prcType == '1'" :title="record.serialNumber">
+            {{record.serialNumber}}
+        </span>
+         <span v-else :title="record.prcNum">
+            {{record.prcNum}}
+         </span>
+      </span>
+      <span slot="titleIndex" slot-scope="text,record">
+          <span v-if="record.prcType == '1'" :title="record.title">
+            {{record.title}}
+        </span>
+         <span v-else :title="record.prcName">
+            {{record.prcName}}
+         </span>
+      </span>
       <span slot="operation" slot-scope="record">
           <a @click="dealWith(record)" style="margin-right:8px">{{$t('Processing')}}</a>
       </span>