Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleCabinetRecordMapper.xml

@@ -159,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cabinet_no = #{deviceId},
             save_status = '3',
             valid_duration = TIMESTAMPDIFF(HOUR , enter_cabinet_time, now()),
-            duration_standard = if(TIMESTAMPDIFF(HOUR, enter_cabinet_time, now()) > 48, 1, 2),
+            duration_standard = if(TIMESTAMPDIFF(HOUR, enter_cabinet_time, now()) >= 48, 1, 2),
             sample_take_staff_id = #{staffId}
             where record_id = #{sampleId};
         </if>