Merge remote-tracking branch 'origin/huacheng_test' into local_20221014

yanghui

2022-10-21 5f3cf501f9f6c216df17ee8af6618b55b537d21a

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java

@@ -120,7 +120,7 @@
        //添加user
        R addUserResult = userService.addConvenientMerchantUser(convenientMerchantDTO);
        if (R.isOk(addUserResult)) {
            Long merchantUserId =Long.parseLong(addUserResult.getData().toString());
            Long merchantUserId = Long.parseLong(addUserResult.getData().toString());
            convenientMerchantDO.setUserId(merchantUserId);
            this.baseMapper.updateById(convenientMerchantDO);
        } else {