zhou #16

Merged
Ghost merged 2 commits from zhou into master 2026-08-07 12:14:41 +08:00
2 Commits
Author SHA1 Message Date
李鹏宇 9efb4bf916 Merge branch 'refs/heads/master' into zhou
# Conflicts:
#	college/__manifest__.py
#	college/models/__init__.py
#	college/security/ir.model.access.csv
#	college/static/src/img/about.png
2026-08-07 12:13:49 +08:00
李鹏宇 6fcad70326 模块迁移 2026-08-07 11:58:17 +08:00