记得上下班打卡 | git大法好,push需谨慎

Commit 16a01bbe authored by 姜秀龙's avatar 姜秀龙

Merge branch 'refs/heads/250115-realNameAndinformation-optimization' into container-test

parents 332e6c38 62f40bdc
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<div class="col-sm-10"> <div class="col-sm-10">
<div class="radio check-box"> <div class="radio check-box">
<label> <label>
<input type="radio" value="1" name="noticeType" checked=""> 购票须知 <input type="radio" value="1" name="noticeType" checked=""> 购票说明
</label> </label>
</div> </div>
<div class="radio check-box"> <div class="radio check-box">
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<label>须知类型:</label> <label>须知类型:</label>
<select name="noticeType"> <select name="noticeType">
<option value="">全部</option> <option value="">全部</option>
<option value="1">购票须知</option> <option value="1">购票说明</option>
<option value="2">观演须知</option> <option value="2">观演须知</option>
</select> </select>
</li> </li>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<div class="radio check-box"> <div class="radio check-box">
<label> <label>
<input type="radio" value="1" name="noticeType" <input type="radio" value="1" name="noticeType"
th:checked="${BuyNoticeVo.noticeType == 1}"> 购票须知 th:checked="${BuyNoticeVo.noticeType == 1}"> 购票说明
</label> </label>
</div> </div>
<div class="radio check-box"> <div class="radio check-box">
......
...@@ -100,7 +100,7 @@ public class KylinBuyNoticeServiceImpl extends ServiceImpl<KylinBuyNoticeMapper, ...@@ -100,7 +100,7 @@ public class KylinBuyNoticeServiceImpl extends ServiceImpl<KylinBuyNoticeMapper,
// 设置须知类型名称 // 设置须知类型名称
if (data.getNoticeType() != null) { if (data.getNoticeType() != null) {
BuyNoticeVo.setNoticeTypeName(data.getNoticeType() == 1 ? "购票须知" : "观演须知"); BuyNoticeVo.setNoticeTypeName(data.getNoticeType() == 1 ? "购票说明" : "观演须知");
} }
// 格式化时间显示 // 格式化时间显示
...@@ -135,7 +135,7 @@ public class KylinBuyNoticeServiceImpl extends ServiceImpl<KylinBuyNoticeMapper, ...@@ -135,7 +135,7 @@ public class KylinBuyNoticeServiceImpl extends ServiceImpl<KylinBuyNoticeMapper,
if (list != null) { if (list != null) {
for (KylinBuyNotice item : list) { for (KylinBuyNotice item : list) {
if (item.getNoticeType() != null) { if (item.getNoticeType() != null) {
item.setNoticeTypeName(item.getNoticeType() == 1 ? "购票须知" : "观演须知"); item.setNoticeTypeName(item.getNoticeType() == 1 ? "购票说明" : "观演须知");
} }
} }
} }
...@@ -171,7 +171,7 @@ public class KylinBuyNoticeServiceImpl extends ServiceImpl<KylinBuyNoticeMapper, ...@@ -171,7 +171,7 @@ public class KylinBuyNoticeServiceImpl extends ServiceImpl<KylinBuyNoticeMapper,
// 设置须知类型名称 // 设置须知类型名称
if (item.getNoticeType() != null) { if (item.getNoticeType() != null) {
vo.setNoticeTypeName(item.getNoticeType() == 1 ? "购票须知" : "观演须知"); vo.setNoticeTypeName(item.getNoticeType() == 1 ? "购票说明" : "观演须知");
} }
// 格式化时间显示 // 格式化时间显示
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment