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

zjj

2024-05-17 90c8f5acd9a01830e181e93317f1f4588bd62f44

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

@@ -23,7 +23,7 @@
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.INPUT)
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**