develop # Conflicts: # mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java # mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java # mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java # mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java # mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java # mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java # mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java # mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java # mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java # mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml # mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml