Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

service-api/src/main/java/com/java110/api/configuration/ServiceConfiguration.java

@@ -69,6 +69,7 @@ public class ServiceConfiguration {
         exclusions.append("/app/shopType/queryShopType,");
         exclusions.append("/app/housekeepingType/queryHousekeepingType,");
         exclusions.append("/app/couponUser.listCouponUser,");
+        exclusions.append("/app/machine.customCarInOutCmd,");
         exclusions.append("/callComponent/propertyRightRegistration.savePropertyRightRegistration");
 
 

service-common/src/main/java/com/java110/common/cmd/machine/UnlicensedCarMachineQrCodeUrl.java

@@ -77,7 +77,7 @@ public class UnlicensedCarMachineQrCodeUrl extends AbstractServiceCmdListener {
         List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
         String ownerUrl = MappingCache.getValue("OWNER_WECHAT_URL");
         ownerUrl += ("/#/pages/unlicensedCarIn/unlicensedCarIn?communityId=" +
-                reqJson.getString("communityId") + "$machineId=" +
+                reqJson.getString("communityId") + "&machineId=" +
                 reqJson.getString("machineId"));
         if (smallWeChatDtos != null && smallWeChatDtos.size() > 0) {
             ownerUrl += ("&appId=" + smallWeChatDtos.get(0).getAppId());