Merge remote-tracking branch 'origin/Regulation' into Regulation

# Conflicts:
#	src/main/java/com/izouma/wenlvju/repo/SettingRepo.java
#	src/main/java/com/izouma/wenlvju/web/SettingController.java
#	src/main/vue/src/views/organization/OrganizationInfo.vue
#	src/test/java/com/izouma/wenlvju/repo/RepoTest.java