Merge branch 'pxb' into xin

xin

yesterday d3563f0bdb487124d79cdd20d0f8bfc79db31f24

 oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java

@@ -57,7 +57,7 @@
        UserMerchant userMerchant = new UserMerchant();
        userMerchant.setMerchantId(resources.getMerchantId());
        userMerchant.setUserId(resources.getUserId());
        userMerchant.setRoleType(MerchantRole.OWNER.getRole());
        userMerchant.setRoleType(MerchantRole.ADMIN.getRole());
        userMerchantService.create(userMerchant);
    }