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

zjj

2023-12-27 d814bde01eb91d1544b718463cd31317726bbf6b

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

@@ -16,7 +16,7 @@

    @ApiModelProperty(value= "")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    private Integer id;

    @ApiModelProperty(value= "")
    private String owner;