Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-06 828b592b5f8e31204f93bcc2ea0c5866bdc0dcf0

 src/main/java/com/zy/asrs/mapper/AgvLocMastMapper.java

@@ -9,7 +9,8 @@
@Mapper
public interface AgvLocMastMapper extends BaseMapper<AgvLocMast>{

    @Delete("delete from agv_loc_mast")
    //@Delete("delete from agv_loc_mast")
    @Delete("delete from agv_loc_mast where floor = '3'")
    public void deleteAll();

    @Update("update agv_loc_mast set loc_type2 = ${locType2}" +