Merge remote-tracking branch 'origin/master'

hdy

2024-01-18 2cc5a1afe8296d148f0a32989395d538e5323a8e

 jcdm-main/src/main/java/com/jcdm/main/bs/workshop/service/IBsWorkshopInfoService.java

@@ -1,6 +1,8 @@
package com.jcdm.main.bs.workshop.service;

import java.util.List;

import com.jcdm.common.core.domain.entity.SysUser;
import com.jcdm.main.bs.workshop.domain.BsWorkshopInfo;

/**
@@ -58,4 +60,7 @@
     * @return 结果
     */
    public int deleteBsWorkshopInfoById(Long id);

    public String importWrokshop(List<BsWorkshopInfo> userList, Boolean isUpdateSupport, String operName);

}