升级spring-boot版本

src/main/resources/static/app/business/device/views/deviceStorage-edit.html

@@ -36,6 +36,11 @@
                                                     <option value="1" ng-selected="1">正常</option>
                                                     <option value="0">已作废</option>
                                                 </select>
+                                                <select ng-model="dSbxxsjy.status" name="status" required>
+                                                    <option value="">--请选择--</option>
+                                                    <option value="1">正常</option>
+                                                    <option value="0">已作废</option>
+                                                </select><i></i>
                                             </label>
                                         </section>
                                     </div>

src/main/resources/static/app/system/controller/userCtrl.js

@@ -142,9 +142,9 @@ angular.module('app.system').controller("userEditCtrl",
                 	$scope.crkRoleIds.push($scope.crkRoleId);
                 }
                 $scope.user.orgId=$scope.userOrg[0].id;
-                if($stateParams.userId == null || $stateParams.userId == ""){
+                //if($stateParams.userId == null || $stateParams.userId == ""){
                 	$scope.user.password = md5($scope.user.password);
-                }
+                //}
                 $("input[name='rzrq']").each(function(j,item){
                     if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
                         $scope.user.rzrq = $filter('date')(item.value, "yyyy-MM-dd");