<<<<<<< HEAD ruoyi com.ruoyi 3.1 4.0.0 ruoyi-generator generator代码生成 1.7 org.apache.velocity velocity ${velocity.version} com.ruoyi ruoyi-common ${ruoyi.version} ======= ruoyi com.ruoyi 3.1 4.0.0 ruoyi-generator generator代码生成 1.7 org.apache.velocity velocity ${velocity.version} com.ruoyi ruoyi-common ${ruoyi.version} >>>>>>> c404de177361c58256c3fe7ac8124ea9ac7f890d