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

src/main/java/com/yxproject/start/mapper/ReceiptMapper.java

@@ -133,10 +133,11 @@ public interface ReceiptMapper {
     public List<Map<String,Object>> selectDetailList(@Param("receiptId") String receiptId);
 
 
-    //根据传入的交接单ID和复核人ID插入复核人、复核时间
+    //根据传入的交接单ID和复核人ID插入复核人、复核时间、更改状态
     @Update("update receipt_list set \n" +
             "check_date = #{date},\n" +
             "check_name=#{checkName} \n" +
+            "state = 1"+
             "where id=#{receiptId}")
     public boolean updateReceiptList(@Param("receiptId") String receiptId,@Param("checkName") String checkName,@Param("date") Date date);