合并远程更改

This commit is contained in:
zhaopeng 2026-02-02 17:27:29 +08:00
parent b18838fdaa
commit d2d285887e
2 changed files with 2 additions and 1 deletions

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/weaver-hrm-salary" vcs="Git" />
</component>
</project>

@ -1 +1 @@
Subproject commit 6e4882bde3aee1b306cea400e57f959913546c3d
Subproject commit bcc89b688a631f11bbd3c12a61cb670328702844