Merge remote-tracking branch 'origin/master'

Fixiaobai

2023-11-03 279b381d288cf6d1358408684d308d50ef3dd7a5

 mes-basic/src/main/java/com/chinaztt/mes/basic/service/ParamService.java

@@ -23,6 +23,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.chinaztt.mes.basic.entity.Param;
import com.chinaztt.mes.basic.excel.ParamData;
import com.chinaztt.mes.basic.dto.ParamPlusDto;
import com.chinaztt.ztt.common.core.util.R;

import java.util.List;
@@ -42,7 +43,7 @@
    * @param ids
    * @return
    */
   R<Boolean> fullSave(Param param);
   R<Boolean> fullSave(ParamPlusDto param);

   /**
    * 修改