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

zhou zhou

6 天以前 94e3cc94d83f5ec1bb64e48360a15d057f3643d9

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

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

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

    /**