Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
846bc02a
authored
May 14, 2018
by
chongli
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'f-6.6.7' of 192.168.10.6:caosy/fun-admin into f-6.6.7
parents
199e0dd3
fafcf820
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
src/main/webapp/WEB-INF/templates/500.ftl
src/main/webapp/WEB-INF/templates/golf/resourcePriceList.ftl
src/main/webapp/WEB-INF/templates/500.ftl
View file @
846bc02a
<@com.layout title="系统异常" module="error" current="error">
<div class="alert alert-error">
哇噢>.<,系统发生异常,请联系程序猿:爱玩开发(iw
dev@Ctrip
.com)!!!
哇噢>.<,系统发生异常,请联系程序猿:爱玩开发(iw
antech@ctripiwan
.com)!!!
</div>
</@com.layout>
src/main/webapp/WEB-INF/templates/golf/resourcePriceList.ftl
View file @
846bc02a
...
...
@@ -51,9 +51,9 @@
<th>会员返现</th>
<th>预付款</th>
<th>vip首单立减</th>
<th>vip随机立减</th>
<!--
<th>vip随机立减</th>
<th>社员价</th>
<th>社员立减</th>
-->
<th>社员立减</th>
<th>社员嘉宾价</th>
<th>社员嘉宾立减</th>
<th>状态</th>
...
...
@@ -87,8 +87,8 @@
<td>${item.prepaidPrice}</td>
<td>${item.vipFirstReduction}</td>
<td>${item.vipMinRandom} ~ ${item.vipMaxRandom}</td>
<!--
<td>${item.communePrice!}</td>
<td>${item.communeMinus!}</td>
-->
<td>${item.communePrice!}</td>
<td>${item.communeMinus!}</td>
<td>${item.communeGuestPrice!}</td>
<td>${item.communeGuestMinus!}</td>
<td>${item.getStatusDisplay()}</td>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment