Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-09-29 01eb7179ab78857b3711e70e18dd8278004c2210

 flower_city/src/main/resources/mapper/TransactionEventMapper.xml

@@ -129,6 +129,15 @@
        order by create_time desc
    </select>

    <select id="selectListByIds"  resultMap="TransactionEventEntityResult">
        <include refid="selectTransactionEventList"/>
        WHERE id IN
        <foreach collection="array" item="id" index="index" open="(" close=")" separator=",">
            #{id}
        </foreach>
        order by create_time desc
    </select>

    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.TransactionEvent">
        insert into automessage_transaction_event (
        <if test="id != null">id,</if>