|  | @@ -84,12 +84,12 @@
 | 
											
												
													
														|  |                  <tr style="border-top: 0;">
 |  |                  <tr style="border-top: 0;">
 | 
											
												
													
														|  |                      <td style="border-top: 0;" rowspan="${circulationUsers?size}" class="title">审批意见:</td>
 |  |                      <td style="border-top: 0;" rowspan="${circulationUsers?size}" class="title">审批意见:</td>
 | 
											
												
													
														|  |                      <td class="title" style="width: 110px;border-top: 0;">${circulationUser.state!}:</td>
 |  |                      <td class="title" style="width: 110px;border-top: 0;">${circulationUser.state!}:</td>
 | 
											
												
													
														|  | -                    <td style="border-top: 0;" class="concat">${circulationUser.remarks!}<span style="color: #ffffff;">${circulationUser.realName!}</span></td>
 |  | 
 | 
											
												
													
														|  | 
 |  | +                    <td style="border-top: 0;" class="concat">${circulationUser.remarks!}<span style="color: #ffffff;">${circulationUser.userId!}</span></td>
 | 
											
												
													
														|  |                  </tr>
 |  |                  </tr>
 | 
											
												
													
														|  |              <#else>
 |  |              <#else>
 | 
											
												
													
														|  |                  <tr>
 |  |                  <tr>
 | 
											
												
													
														|  |                      <td class="title" style="width: 110px;">${circulationUser.state!}:</td>
 |  |                      <td class="title" style="width: 110px;">${circulationUser.state!}:</td>
 | 
											
												
													
														|  | -                    <td class="concat">${circulationUser.remarks!}<span style="color: #ffffff;">${circulationUser.realName!}</span></td>
 |  | 
 | 
											
												
													
														|  | 
 |  | +                    <td class="concat">${circulationUser.remarks!}<span style="color: #ffffff;">${circulationUser.userId!}</span></td>
 | 
											
												
													
														|  |                  </tr>
 |  |                  </tr>
 | 
											
												
													
														|  |              </#if>
 |  |              </#if>
 | 
											
												
													
														|  |          </#list>
 |  |          </#list>
 | 
											
										
											
												
													
														|  | @@ -99,7 +99,7 @@
 | 
											
												
													
														|  |                      <td rowspan="${executors?size}" class="title">执行:</td>
 |  |                      <td rowspan="${executors?size}" class="title">执行:</td>
 | 
											
												
													
														|  |                  </#if>
 |  |                  </#if>
 | 
											
												
													
														|  |                  <td class="title" style="width: 110px;">${executor.state!}:</td>
 |  |                  <td class="title" style="width: 110px;">${executor.state!}:</td>
 | 
											
												
													
														|  | -                <td class="concat">${executor.remarks!}<span style="color: #ffffff;">${executor.realName!}</span></td>
 |  | 
 | 
											
												
													
														|  | 
 |  | +                <td class="concat">${executor.remarks!}<span style="color: #ffffff;">${executor.userId!}</span></td>
 | 
											
												
													
														|  |              </tr>
 |  |              </tr>
 | 
											
												
													
														|  |          </#list>
 |  |          </#list>
 | 
											
												
													
														|  |      </table>
 |  |      </table>
 |