Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/controller/BusinessOpenTenderController.java

@@ -76,7 +76,7 @@ public class BusinessOpenTenderController extends BaseController {
     @Log(title = "开标记录批量导入", businessType = BusinessType.IMPORT)
     @PostMapping("/importData/{businessId}")
     public R<Map<String, Object>> importData(@RequestPart("file") MultipartFile file, @PathVariable Integer businessId) throws Exception {
-        List<BusinessOpenTender> list = new ExcelUtils<>(BusinessOpenTender.class).importExcel(file.getInputStream(), 1);
+        List<BusinessOpenTender> list = new ExcelUtils<>(BusinessOpenTender.class).importExcel(file.getInputStream(), 2);
         if (list.isEmpty()) throw new BusinessException("请填写导入数据！");
         int sucessCount = 0;
         List<String> errorList = new ArrayList<>();

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/domain/BusinessOpenTender.java

@@ -29,7 +29,7 @@ public class BusinessOpenTender implements Serializable {
     /**
      * 投标人
      */
-    @Excel(name = "投标人")
+    @Excel(name = "投标人（必填）")
     private String tenderer;
     /**
      * 企业性质

dsk-system/src/main/java/com/dsk/system/service/impl/ISysTenantServiceImpl.java

@@ -342,6 +342,9 @@ public class ISysTenantServiceImpl implements ISysTenantService {
     @CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId")
     public Boolean updateByBo(SysTenantBo bo) {
         SysTenant tenant = BeanUtil.toBean(bo, SysTenant.class);
+        if (TenantConstants.DISABLE.equals(bo.getStatus())) {
+            tenant.setExpireTime(new DateTime());
+        }
         tenant.setTenantId(null);
         return baseMapper.updateById(tenant) > 0;
     }