Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

src/main/java/com/template/controller/LoginController.java

@@ -434,12 +434,14 @@ public class LoginController implements LoginControllerAPI {
         wlv.setDistrict(student.getDistrict());
         wlv.setIsPay(student.getIsPay());
         wlv.setPhone(student.getPhone().replace("(+86)", ""));
+        wlv.setArrvieDate(student.getArrvieDate());
         wlv.setCollege(college == null ? "微校获取不到院校" : college);
         long expired = 1000 * 60 * 60 * 24 * 365;
         TokenDateVo token = JWTUtil.getToken(id_card, student.getId(), expired);
         wlv.setToken(token.getToken());
         System.out.println("微校授权成功：" + user_name + "" + card_number);
         response.sendRedirect(wxOpenidConfig.getIp() + "/#/pages/index/index/?urlstr=" + urlstr + "&token=" + token.getToken() + "&type=" + idenType);
+        System.out.println("微校授权获取用户信息结果" + JSON.toJSON(wlv));
         return CommonResult.ok(wlv);
     }
 

src/main/java/com/template/controller/WelcomeStudentController.java

@@ -791,7 +791,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult deleteStudentInfo(int id) throws Exception {
-
+        System.out.println("删除了学生信息："+id);
         WelcomeStudent ws = welcomeStudentService.getManageById(id);
         if (ws == null) {
             return CommonResult.fail("学生信息已失效，无法进行删除操作！");

src/main/java/com/template/model/vo/wxLoginVo.java

@@ -1,6 +1,7 @@
 package com.template.model.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -131,6 +132,7 @@ public class wxLoginVo {
     private String arrive;
 
     @ApiModelProperty(value = "到站日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date arrvieDate;
 
     @ApiModelProperty(value = "到站时间")