Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	.idea/workspace.xml

.idea/modules.xml

@@ -3,8 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/model/cloud-model/cloud-model.iml" filepath="$PROJECT_DIR$/model/cloud-model/cloud-model.iml" />
-      <module fileurl="file://$PROJECT_DIR$/model/cloud-model/cloud-model.iml" filepath="$PROJECT_DIR$/model/cloud-model/cloud-model.iml" />
-      <module fileurl="file://$PROJECT_DIR$/model/model.iml" filepath="$PROJECT_DIR$/model/model.iml" />
       <module fileurl="file://$PROJECT_DIR$/model/model.iml" filepath="$PROJECT_DIR$/model/model.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/yunsu.iml" filepath="$PROJECT_DIR$/.idea/yunsu.iml" />
     </modules>

model/cloud-model/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 # ####################################################################################################
 # ·þÎñ¶ËÅäÖÃ
-server.port=8098
+server.port=8099
 server.servlet.context-path=/
 server.tomcat.uri-encoding=UTF-8
 # ####################################################################################################