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

zhangc

2024-12-20 78ff74dfc9c42ee12993ac01c43063d0432231e3

 src/main/java/com/zy/common/model/LocDto.java

@@ -23,6 +23,8 @@

    private Double anfme;

    private Double weight;

    private boolean lack = false;

    private List<Integer> staNos;