Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs

whycq

2024-04-10 2832d39ad91a6de161bf9b8f8e3307bf6bc7fb65

 src/main/java/com/zy/common/service/AgvCommonService.java

@@ -230,7 +230,7 @@
    private AgvLocMast getLocNoRule(int type){
        return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
                .eq("loc_sts","O")
                .eq(false,"loc_type1",type));
                .eq("loc_type1",type));
    }