Merge remote-tracking branch 'origin/master'

master
OathK1per 2022-08-26 16:55:55 +08:00
commit 1fb3ab6f21
1 changed files with 2 additions and 2 deletions

View File

@ -42,7 +42,7 @@
<td>${list.candidateUsers!}</td> <td>${list.candidateUsers!}</td>
<td><#if list.endTime??>${list.endTime?datetime}</#if></td> <td><#if list.endTime??>${list.endTime?datetime}</#if></td>
<td> <td>
<#if !list.endTime??> <#--<#if !list.endTime??>
<button type="button" <button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary" class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="deleteProcIns('${list.procInsId}', '系统管理员撤销')"> onclick="deleteProcIns('${list.procInsId}', '系统管理员撤销')">
@ -50,7 +50,7 @@
撤销流程 撤销流程
</button> </button>
</#if> </#if>-->
<button type="button" <button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary" class="am-btn am-btn-default am-btn-xs am-text-secondary"