chenxz 2ae8879bb5 fix conflict 7 lat temu
..
src 2ae8879bb5 fix conflict 7 lat temu
pom.xml f3d89d400f fix jpa&add caughted for medalDto 7 lat temu