Merge remote-tracking branch 'origin/master'

zss

2023-11-15 6c264ce8c372e18109f0a3b9f5754955d22ba353

 mes-basic/src/main/java/com/chinaztt/mes/basic/mapper/ParamJoinTemplateMapper.java

@@ -43,4 +43,6 @@
         @Param("defaultValue") String defaultValue,
         @Param("technologyOperationParamId") Long technologyOperationParamId,
         @Param("technologyOperationTemplateId") Long technologyOperationTemplateId);

   int deleteByCondition(@Param("paramId") long paramId,@Param("templateId")long templateId);
}