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

Junjie

2023-11-08 7f9d058a0e632be6a3daf6f46d26b69742db0720

 src/main/resources/mapper/PriQuoteMapper.xml

@@ -9,6 +9,7 @@
        <result column="sheet_data" property="sheetData" />
        <result column="create_time" property="createTime" />
        <result column="dept_id" property="deptId" />
        <result column="plan_id" property="planId" />
        <result column="form" property="form" />
        <result column="settle" property="settle" />
        <result column="settle_msg" property="settleMsg" />