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

doum

2 小时以前 e8a0fd29e22c43c2146ffae0564ff03cbf0fc2c4

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java

@@ -3,9 +3,9 @@
import com.doumee.config.DataSyncConfig;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.service.business.third.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
@@ -13,6 +13,7 @@
import com.doumee.service.business.CompanyService;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
import com.taobao.api.ApiException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -163,8 +164,6 @@
    public ApiResponse<List<CompanyDTO>> findCompanyTreePage(Integer type){
        return ApiResponse.success(companyService.findCompanyTreePage(type));
    }



    @ApiOperation("全量部门信息同步")
    @PostMapping("/syncAll")