Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseController.java

@@ -258,7 +258,7 @@ public class EnterpriseController {
     @RequestMapping("/edit-user")
     public RestResponse editUser(UserDTO userDTO) {
         //自动密码
-        boolean isAutoPassword = userDTO.getPasswordType() == UserConstants.CREATE_AUTO;
+        boolean isAutoPassword = userDTO.getPasswordType() != null && userDTO.getPasswordType() == UserConstants.CREATE_AUTO;
         String autoPassword = null;
         if (isAutoPassword) {
             String password = UserPasswordUtil.createPasswordAuto();