Merge remote-tracking branch 'origin/master'

于杰

2025-08-29 6b6f3fbd333894209e0df1822ff89881aa4319fe

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java

@@ -1,5 +1,6 @@
package com.example.erp.mapper.mm;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.dto.mm.FinishedOperateLogDTO;
import com.example.erp.entity.mm.FinishedOperateLog;
import com.example.erp.entity.pp.FlowCard;
@@ -13,7 +14,7 @@
import java.util.Map;

@Mapper
public interface FinishedOperateLogMapper extends CrudRepository<FinishedOperateLog,Long> {
public interface FinishedOperateLogMapper extends BaseMapper<FinishedOperateLog> {
    FinishedOperateLog getselectFinishedOperateLog();

    Boolean insertIntFinishedOperateLog(@Param("flowCard") FlowCard flowCard ,@Param("userName") String userName,
@@ -93,7 +94,7 @@

    List<Map<String, String>> getPrimaryListLimt(String orderId, String processId, String remarks);

    List<Map<String, String>> getPrimaryListLimts(String customerName, String project, String remarks);
    List<Map<String, String>> getPrimaryListLimts(Integer customerId, String project, String remarks);

    List<Map<String, Object>> getDetailList(String orderId, String processId, String remarks);