Merge branch 'springboot3.5_cs' into spring3.5

zhou zhou

昨天 1724f77c35022b643c28dd3e5547679a5edc2d49

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

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

    /**