Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-27 c7a1a16c8d22b64f9025e800ebaf89b19b530228

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

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

    /**
@@ -33,6 +33,11 @@
    private Long reserveSubId;

    /**
     * 预约登记记录id
     */
    private Long reserveRecordId;

    /**
     * 预约登记题目选项id
     */
    private Long reserveSelectionId;