Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-22 1627ec87769c53f3f7bc69eaf75cc5b0a38ff112

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

@@ -6,7 +6,6 @@
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.A;
import org.springframework.web.bind.annotation.*;

import java.io.*;
@@ -94,9 +93,8 @@
        return sb.toString();
    }


    @ApiOperation(value = "拉取公众号列表")
    @GetMapping("/list/noToken")
    @GetMapping(value = "/list/noToken",produces="application/json;charset=UTF-8")
    public R pageDiscuss() throws Exception{
        WxOfficialApi officialApi = new WxOfficialApi();