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

lsh

1 天以前 3041eb1b0b76b75b916939e77c7ae97a80fe5af3

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

@@ -24,6 +24,10 @@
    private String standby2 = "";
    private String standby3 = "";

    private String boxType1 = "1";
    private String boxType2 = "1";
    private String boxType3 = "1";

    private String orderNo;

    private Double anfme;