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

Junjie

2023-12-25 84d74096a72578a83d9f3b48afa8c39b4ba0ae9a

 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;