Merge branch 'dev-1.1.4' into 'dev-1.1.4'

Add FIY

See merge request lihong/thmz_system!58

src/main/java/cn/hnthyy/thmz/mapper/his/yp/YpMzFytjMapper.java

@@ -379,7 +379,7 @@ public interface YpMzFytjMapper {
     @Update("update yp_mz_fytj set manu_no=#{manuNo} where real_no=#{realNo} and order_no=#{orderNo} and item_no=#{itemNo}")
     int updateManuNo(@Param("manuNo") String manuNo, @Param("realNo") Integer realNo, @Param("orderNo") Integer orderNo, @Param("itemNo") Integer itemNo);
 
-    @Update(" select count(*) from yp_mz_fytj where serial_no = #{oriSerialNo} ")
+    @Select(" select count(*) from yp_mz_fytj where serial_no = #{oriSerialNo} ")
     int queryYpMzFytjByOriSerialNo(@Param("oriSerialNo") Integer oriSerialNo);
 
     @Update(" update yp_mz_fytj set receipt_no =#{receiptNo},serial_no=#{serialNo},real_no=#{serialNo} where serial_no = #{oriSerialNo} ")