Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

 screen-manage/src/main/java/com/moral/api/mapper/DeviceAdjustValueMapper.java

@@ -2,7 +2,10 @@

import com.moral.api.entity.DeviceAdjustValue;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.pojo.dto.adjust.AdjustDTO;


import java.util.List;
import java.util.Map;

/**
@@ -17,4 +20,7 @@

    void updateDeviceAdjustValue(Map map);


    List<AdjustDTO> selectAllAdjust(Map map);

}