Merge branch 'master' of http://111.30.93.211:10101/r/supipe

叶松

2023-10-26 979c7c817b2e7d2430ac447b10f943c12dac3b64

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/mapper/SysEmbedmentGoodsMapper.java

@@ -26,7 +26,7 @@

   SysEmbedmentGoodsEntity findEntity(String id);

   String embedmentNameAndType(@Param("embedmentGoodsName") String embedmentGoodsName, @Param("embedmentType") String embedmentType);
   String embedmentNameAndType(@Param("embedmentName") String embedmentGoodsName, @Param("embedmentType") String embedmentType,@Param("embedmentModel")String embedmentModel);

   void alarmSet(EmbedmentGoodsDto embedmentGoodsDto);