Merge branch 'cmg-basefun-hzqmjk' into master-jiayan-test

fwq

2024-08-19 7232dfe75b210e021a61a4b848bf0e9c951abd0d

1
2
3
4
5
6
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="Encoding">
    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
  </component>
</project>