Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-20 bddad8b22f9b505274a8c2904d9d81efda89f497

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseBase.java

@@ -29,7 +29,7 @@
    private static final long serialVersionUID = -68726161070095574L;

    @TableId(type = IdType.ASSIGN_ID)
    private Integer id;
    private Long id;

    /**
     * 义仓说明