Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-07 b83ccceb2f615933449e03388d8c2958b1ae0207

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

@@ -152,7 +152,7 @@
            serviceIds.forEach(serviceId -> {
                ConvenientServiceCategoryDO convenientServiceCategoryDO = convenientServiceCategoryDAO.selectById(serviceId);
                convenientServiceCategoryDAO.createMerchantServiceRelation(Snowflake.getId(), merchantId, serviceId,
                        convenientServiceCategoryDO.getName(), convenientMerchantDTO.getCreatedBy());
                        convenientServiceCategoryDO.getName(), convenientMerchantDO.getCreatedBy());
            });
        }