# Conflicts:
#	mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java
#	mallinkAdmin/src/main/java/com/iformall/controller/DataTowerController.java
#	mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java
#	mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java
#	mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java
#	mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java
#	mallinkAdmin/src/main/java/com/iformall/controller/WxScreenAdController.java
#	mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
#	mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java
#	mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java
#	mallinkService/src/main/java/com/iformall/common/ErrorCode.java
#	mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java
#	mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java
#	mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java
#	mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java
#	mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java
#	mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java
#	mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java
#	mallinkService/src/main/java/com/iformall/service/WxAuthorizerInfoService.java
#	mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java
#	mallinkService/src/main/java/com/iformall/service/WxOrderGroupService.java
#	mallinkService/src/main/java/com/iformall/service/WxScreenAdService.java
#	mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java
#	mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml
#	mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
#	mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml
#	mallinkService/src/main/resources/mapper/WxOrderMapper.xml
#	mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml
#	mallinkWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java
#	mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java
#	mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java
#	pom.xml