Merge remote-tracking branch 'origin/dev'

.gitignore

+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+/**/.apt_generated
+/**/.classpath
+/**/.factorypath
+/**/.project
+/**/.settings
+/**/.springBeans
+/**/.sts4-cache
+
+### IntelliJ IDEA ###
+/**/.idea
+/**/*.iws
+/**/*.iml
+/**/*.ipr
+.idea/
+/**/.idea/
+
+### NetBeans ###
+/**/nbproject/private/
+/**/build/
+/**/nbbuild/
+/**/dist/
+/**/nbdist/
+/**/.nb-gradle/
+/**/target/
+/**/temp/
+/**/.DS_Store
+/**/.mvn*
+/**/mvn*
+
+
+### VS Code ###
+.vscode/
+/makeit-web-report/src/main/resources/application.yml

README.md

@@ -3,8 +3,12 @@ iot 平台端
 
 server-web        启动类
 
-server-module     业务模块
+server-module     平台端业务模块   controller
+
+saas-module     saas端业务模块  controller
 
 server-api        提供外部接口
 
+server-service     存放业务service、mapper、entity
+
 server-common     通用模块   包含通用entity、service、mapper类等
\ No newline at end of file

saas-module/src/main/java/com/makeit/controller/sys/ElderController.java

+package com.makeit.controller.sys;
+
+public class ElderController {
+}

server-module/src/main/java/com/makeit/module/controller/elder/ElderController.java

+package com.makeit.module.controller.elder;
+
+public class ElderController {
+}

server-module/src/main/java/com/makeit/module/elder/Elder.java

-package com.makeit.module.elder;
-
-public class Elder {
-}

server-service/src/main/java/com/makeit/entity/platform/Test.java

+package com.makeit.entity.platform;
+
+public class Test {
+}