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

lsh

昨天 3041eb1b0b76b75b916939e77c7ae97a80fe5af3

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

@@ -23,7 +23,8 @@
    private String owner;

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

    @ApiModelProperty(value= "状态")
    private Integer status;
@@ -33,5 +34,4 @@
    private Integer ownerType;

    public LocOwner() {}

}