develop

# Conflicts:
#	mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java
#	mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
#	mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java
#	mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java
#	mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
#	mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java
#	mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java
#	mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
#	mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java
#	mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java
#	mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java
#	mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java
#	mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java
#	mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java
#	mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
#	mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java
#	mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
#	mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java
#	mallinkService/src/main/java/com/iformall/domain/po/WxCouponPresent.java
#	mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java
#	mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java
#	mallinkService/src/main/java/com/iformall/service/WxCouponService.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java
#	mallinkService/src/main/resources/mapper/WxCouponMapper.xml
#	mallinkSysAdmin/src/main/java/com/iformall/config/RedisConfig.java
#	mallinkWebSocketServer/src/main/java/com/iformall/config/RedisConfig.java