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

zxl

1 天以前 c4786844ef75025cd27cc3833a0f7cd86ad80781

 framework/src/main/resources/mapper/lmk/ScanPrizeMapper.xml

@@ -54,6 +54,8 @@
            lmk_scan_prize LSP
        WHERE
            LSP.delete_flag = 0
        order by
            LSP.create_time DESC
    </select>
    <resultMap id="getStorePrizeMap" type="cn.lili.modules.lmk.domain.vo.StorePrizeVO">
        <id column="id" property="id"/>