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

manailin

2021-10-08 84fae9aed66f2841b58b2ef66ff7c11cd0dbaacd

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

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

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

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