Merge remote-tracking branch 'origin/devlop-phyz-spring3.5' into devlop-phy...

zhou zhou

2 天以前 830bb157b5e46a6c041d5f0c0a883a22e37cb0f7

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java

@@ -110,7 +110,7 @@
     * 条码
     */
    @ApiModelProperty(value = "条码")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    @TableField(updateStrategy = FieldStrategy.ALWAYS)
    private String barcode;

    /**