Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

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

@@ -20,7 +20,7 @@
 * 分类列表(ComActColumn)表控制层
 *
 * @author makejava
 * @since 2021-10-20 17:28:14
 * @since 2021-11-01 14:38:26
 */
@RestController
@RequestMapping("comActColumn")
@@ -87,6 +87,6 @@
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActColumnService.removeById(id));
        return this.comActColumnService.delete(id);
    }
}