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

xuhy

2023-06-08 c1c307fe42e8de9c9aac5c009e38ad405f934996

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/BaseWarpper.java

@@ -8,7 +8,7 @@
@ApiModel
public class BaseWarpper {
    @ApiModelProperty("id")
    private Integer id;
    private Long id;
    @ApiModelProperty(value = "编号", required = true, dataType = "string")
    private String code;
    @ApiModelProperty(value = "名称", required = true, dataType = "stirng")