Merge branch 'zhaozhengjie1104' into test

101captain

2021-11-11 610c139ca4069775a8d2f967675182b181438b82

Merge branch 'zhaozhengjie1104' into test

 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);
    }