Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

IZCD4L12RTSW0VZ\Administrator

昨天 290e5fd2e74efe19326f56e38c3391aaae23ffc5

 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;

    /**