Merge branch 'master' of http://47.113.197.148:13000/bmmx/OperationSystem

 Conflicts:

	src/main/java/com/om/entity/po/DiagClients.java

	src/main/java/com/om/mapper/DiagClientsMapper.java

	src/main/java/com/om/service/IDiagClientsService.java

src/main/java/com/om/service/impl/DiagClientsServiceImpl.java

@@ -0,0 +1,20 @@
+package com.om.service.impl;
+
+import com.om.entity.po.DiagClients;
+import com.om.mapper.DiagClientsMapper;
+import com.om.service.IDiagClientsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 应用与客户关联表 服务实现类
+ * </p>
+ *
+ * @author bmmx
+ * @since 2024-03-13
+ */
+@Service
+public class DiagClientsServiceImpl extends ServiceImpl<DiagClientsMapper, DiagClients> implements IDiagClientsService {
+
+}