Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/MaintenanceCompany.java

@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 
 /**
@@ -109,7 +109,7 @@ public class MaintenanceCompany implements Serializable {
      * 创建时间
      */
     @TableField("create_date")
-    private LocalDate createDate;
+    private LocalDateTime createDate;
 
     @TableField("limited_num")
     private Integer limitedNum;

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/model/TeamInfoResponse.java

@@ -2,7 +2,7 @@ package cn.com.ty.lift.system.settings.dao.entity.model;
 
 import lombok.Data;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * @author huangyuan
@@ -41,7 +41,7 @@ public class TeamInfoResponse {
     /**
      * 注册时间
      */
-    private LocalDate createDate;
+    private LocalDateTime createDate;
 
     /**
      * 团队图片

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MaintenanceCompanyServiceImpl.java

@@ -34,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -99,11 +98,12 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         maintenanceCompany.setName(maintenanceCompanyRequest.getCompanyName());
         maintenanceCompany.setCorporator(maintenanceCompanyRequest.getCorporator());
         maintenanceCompany.setCreatorId(userId);
+        maintenanceCompany.setTelephone(maintenanceCompanyRequest.getTelephone());
         //设置团队状态为未认证
         maintenanceCompany.setIsCertificated(ApiConstants.CompanyConstants.MAINTENANCE_NOT_CERTIFICATE);
         maintenanceCompany.setRemarks(maintenanceCompanyRequest.getRemarks());
         maintenanceCompany.setLogoImg(maintenanceCompanyRequest.getLogoImg());
-        maintenanceCompany.setCreateDate(LocalDate.now());
+        maintenanceCompany.setCreateDate(LocalDateTime.now());
         if (!this.save(maintenanceCompany)) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存团队信息失败");
         }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/LoginController.java

@@ -92,7 +92,7 @@ public class LoginController {
      * @description 登录
      * @date 2019/11/27 10:03 AM
      */
-    @RequestMapping("/login")
+    @PostMapping("/login")
     @ResponseBody
     public RestResponse login(HttpServletRequest request, @RequestBody UserRequest userRequest) {
         return loginService.login(request, userRequest);

lift-system-service/src/main/java/cn/com/ty/lift/system/wechat/constants/WxConstants.java

@@ -49,7 +49,7 @@ public class WxConstants {
         /**
          * 小程序secret
          */
-        String APP_SECRET = "2e4c634a4f1f54a871e79da9d6f1179e";
+        String APP_SECRET = "f93a555feaa7d1af007d128d5a3dd861";
     }
 
 }