Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-10 ffe024b3d809c540d267cea42bb951aefe357210

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderOperateDO.java

@@ -22,7 +22,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**