Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-22 1e17cb5f4890dabbb23966a4a48ea921411fe811

 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml

@@ -14,6 +14,7 @@
        <result column="yw_condition" property="ywCondition"/>
        <result column="yw_check_result" property="ywCheckResult"/>
        <result column="overtime" property="overtime"/>
        <result column="deduct" property="deduct"/>
    </resultMap>

    <select id="page" resultType="com.ycl.platform.domain.vo.WorkOrderVO">