Merge branch 'feature/Eid' of lvjian/wxbase into feature/Eid

src/main/resources/mybatis/OperationRecordMapper.xml

@@ -17,6 +17,12 @@
             <if test="record.appCode != null">
                 app_code,
             </if>
+            <if test="record.merchSn != null">
+                merch_sn,
+            </if>
+            <if test="record.tokenType != null">
+                token_type,
+            </if>
             <if test="record.createrSn != null">
                 creater_sn,
             </if>
@@ -37,6 +43,12 @@
             <if test="record.appCode != null">
                 #{record.appCode},
             </if>
+            <if test="record.merchSn != null">
+                #{record.merchSn},
+            </if>
+            <if test="record.tokenType != null">
+                #{record.tokenType},
+            </if>
             <if test="record.createrSn != null">
                 #{record.createrSn},
             </if>