李鹏宇 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

..

groups.xml

模块迁移

2026-08-05 19:20:15 +08:00

ir.model.access.csv

Merge branch 'refs/heads/master' into zhou

2026-08-07 12:13:49 +08:00