Merge remote-tracking branch 'origin/master'

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/config/AppConfig.java

 import cn.com.taiji.userw.model.MyFinals;
 
 @Configuration
-@EntityScan(value = {"cn.com.taiji." + AppConfig.APP_NAME + ".entity"})
+@EntityScan(value = {"cn.com.taiji." + AppConfig.APP_NAME + ".entity", "cn.com.taiji.core.entity"})
 @EnableJpaRepositories(
-    basePackages = {"cn.com.taiji." + AppConfig.APP_NAME + ".repo.jpa"},
+    basePackages = {"cn.com.taiji." + AppConfig.APP_NAME + ".repo.jpa", "cn.com.taiji.core.repo.jpa"},
     repositoryFactoryBeanClass = MyJpaRespositoryFactoryBean.class)
 @EnableTransactionManagement(mode = AdviceMode.ASPECTJ, proxyTargetClass = true)
 @ComponentScan(value = "cn.com.taiji.core.manager.comm.client.feign")

zhywpt-app-userw/src/main/resources/bootstrap.yml

 spring:
   application:
-    name: samplew
+    name: local-userw
   mvc:
     locale: zh_CN
   messages:
           - data-id: comm-client.yaml
             refresh: true
 server:
-  port: 8085
+  port: 9083
   servlet:
-    context-path: /samplew/
+    context-path: /userw/
 
 #应用相关配置
 app: