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

pang.jiabao

2024-10-24 a6ae5a74d1de3db517526a3ba5db1e4a2a68cf65

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

@@ -18,7 +18,7 @@
    private static final long serialVersionUID = 1L;

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

    /**