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

lty

昨天 84edd2b6308fa018eab932a2db528b7e6e1e6d13

 src/main/java/com/zy/asrs/entity/OrderDetlPakin.java

@@ -317,19 +317,19 @@
     * 备用1
     */
    @ApiModelProperty(value= "备用1")
    private String standby1 = "";
    private String standby1 = "1";

    /**
     * 备用2
     */
    @ApiModelProperty(value= "备用2")
    private String standby2 = "";
    private String standby2 = "1";

    /**
     * 备用3
     */
    @ApiModelProperty(value= "备用3")
    private String standby3 = "";
    private String standby3 = "1";

    /**
     * 备用1