develop # Conflicts: # mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java # mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java # mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java # mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java # mallinkService/src/main/resources/mapper/WxCouponMapper.xml