From 0590944f5d4a4f93af2a4c9241f0e154a9f41c08 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 23 十一月 2021 17:05:45 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java
index 83b7e01..b34a535 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java
@@ -30,6 +30,7 @@
public R subjectListAdmin(Long reserveId){
List<ComActReserveSubListVO> resultList = new ArrayList<>(100);
resultList.add(new ComActReserveSubListVO("nub","序号"));
+ resultList.add(new ComActReserveSubListVO("time","登记时间"));
resultList.add(new ComActReserveSubListVO("nickName","用户昵称"));
List<ComActReserveSubListVO> subList = this.baseMapper.getReserveSubjectList(reserveId);
if(subList != null && !subList.isEmpty()){
@@ -41,7 +42,6 @@
// resultList.addAll(list);
}
resultList.add(new ComActReserveSubListVO("id","登记流水"));
- resultList.add(new ComActReserveSubListVO("time","登记时间"));
return R.ok(resultList);
}
--
Gitblit v1.7.1