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

1

昨天 e596214d84efa77d0cf316563548f1b1d7643a37

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

@@ -168,26 +168,23 @@
    @ApiModelProperty(value= "拥有者 1: 杰克   ")
    private Integer owner;

    @ApiModelProperty(value= "客户编号")
    private Long uuid;

    /**
     * 备用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