6 months ago · ad97f9796d
--- a/metadata/entity_pkmapping.properties
+++ b/metadata/entity_pkmapping.properties
@@ -1,9 +1,3 @@
 
				-#

			
 
				-<<<<<<< HEAD

			
 
				-#Wed Nov 27 15:51:56 CST 2024

			
 
				-=======

			
 
				-#Wed Nov 27 16:30:09 CST 2024

			
 
				->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633

			
 
				 95FA0614=com.kingdee.eas.hr.project.app.MemberManagementEntry

			
 
				 C5DD122F=com.kingdee.eas.hr.project.app.Employee

			
 
				 44CE7F57=com.kingdee.eas.hr.project.app.ProjectManagementEntry

			
--- a/metadata/facade_pkmapping.properties
+++ b/metadata/facade_pkmapping.properties
@@ -1,6 +0,0 @@
 
				-#

			
 
				-<<<<<<< HEAD

			
 
				-#Wed Nov 27 15:51:56 CST 2024

			
 
				-=======

			
 
				-#Wed Nov 27 16:30:09 CST 2024

			
 
				->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633