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

zxl

4 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

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

@@ -13,7 +13,6 @@
        <result column="generate_num" property="generateNum" />
        <result column="claim_num" property="claimNum" />
        <result column="status" property="status" />
        <result column="material" property="material"/>
    </resultMap>


@@ -50,7 +49,6 @@
            LSP.generate_num,
            LSP.claim_num,
            LSP.status,
            LSP.material,
            LSP.id
        FROM
            lmk_scan_prize LSP