Merge remote-tracking branch 'remotes/origin/szzh' into develop
This commit is contained in:
commit
bc50390a2e
|
@ -52,7 +52,6 @@
|
||||||
|
|
||||||
<!-- Added by Longjun 在最后一页显示创建信息 -->
|
<!-- Added by Longjun 在最后一页显示创建信息 -->
|
||||||
<% if format_date(day) == format_date(@date_to - @days) %>
|
<% if format_date(day) == format_date(@date_to - @days) %>
|
||||||
<h1>Test</h1>
|
|
||||||
<div >
|
<div >
|
||||||
<table width="660">
|
<table width="660">
|
||||||
<tr>
|
<tr>
|
||||||
|
|
Loading…
Reference in New Issue