Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-common/src/main/resources/properties/systemconfig.properties

@@ -28,9 +28,9 @@ APP_PARTNER_IOS=1492557632
 APP_PARTNER_KEY_IOS=89201002892010008920100quanzinet
 APP_TRADE_TYPE_IOS=APP
 #andoir
-APP_ID=wxa9805823769294b6
-APP_PARTNER=1327473801
-APP_PARTNER_KEY=cnitr89201000QZNWcnitr89201000QZ
+APP_ID=wx9c9d978e5698d00f
+APP_PARTNER=1514583081
+APP_PARTNER_KEY=qwelkjuoivc1398767lkj834123kljic
 APP_TRADE_TYPE=APP
 #支付回调
 weixinHost=xxfcmgmt.upyuns.com

xx-common/xx-common-platform-web/pom.xml

@@ -8,8 +8,8 @@
         <version>2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>xx-common-platform-web</artifactId>
+    <packaging>pom</packaging>
 
     <properties>
         <java.version>1.8</java.version>

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/UniversalApplication.java

@@ -14,8 +14,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableAceAuthClient
 @EnableAceCache
 @EnableTransactionManagement
-@MapperScan("com.xxfc.platform.universal.mapper")
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign"})
+@tk.mybatis.spring.annotation.MapperScan(basePackages = "com.xxfc.platform.universal.mapper")
+@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform"})
 public class UniversalApplication {
 
     public static void main(String[] args) {

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/mapper/OrderPayMapper.java

@@ -2,7 +2,6 @@ package com.xxfc.platform.universal.mapper;
 
 import com.xxfc.platform.universal.entity.OrderPay;
 import tk.mybatis.mapper.common.Mapper;
-
 /**
  * 订单支付
  *