Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

manailin

2021-11-23 0590944f5d4a4f93af2a4c9241f0e154a9f41c08

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java

@@ -365,7 +365,6 @@
     */
    @PostMapping("/merchant/add")
    public R addMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO) {
        log.error("catTimeStamp进入service_community", Instant.now().toEpochMilli());
        return convenientMerchantService.addMerchant(convenientMerchantDTO);
    }