Commit Graph

2 Commits

Author SHA1 Message Date
zyj
029826308b Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
#	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
#	sql/ry_20231130.sql
2023-12-13 15:31:38 +08:00
RuoYi
78b1ac4a60 代码生成支持选择前端模板类型 2023-11-30 09:38:07 +08:00