Merge remote-tracking branch 'remotes/origin/szzh' into develop

competition
nwb 11 years ago
commit bc50390a2e

@ -52,7 +52,6 @@
<!-- Added by Longjun 在最后一页显示创建信息 -->
<% if format_date(day) == format_date(@date_to - @days) %>
<h1>Test</h1>
<div >
<table width="660">
<tr>

Loading…
Cancel
Save