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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 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);
    }