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

whycq

2024-05-02 c937e665ccbb763968d30ef2fad61c9eb935abfe

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

@@ -29,10 +29,10 @@
    }

    public LocTypeDto(StaProtocol staProtocol) {
        if (!staProtocol.isWeight()) {
            this.locType1 = 1; // 轻货
        if (staProtocol.isWeight()) {
            this.locType1 = 1; // 重货
        } else {
            this.locType1 = 2; // 重货
            this.locType1 = 2; // 轻货
        }
    }