Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev

lidongdong

2022-11-10 bdbe40f077aa9ca2ec184707d3eab41af13def03

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryStoreClassApi.java

@@ -74,6 +74,7 @@
    @ApiOperation(value = "查询商家分类列表",response = ComBatteryStoreClassVo.class)
    @PostMapping("/list")
    public R queryByList(@RequestBody PageComBatteryStoreClassDto comBatteryStoreClass) {
        comBatteryStoreClass.setStatus(1);
        return this.comBatteryStoreClassService.queryByAppletsList(comBatteryStoreClass);
    }