Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue


 Conflicts:

	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

	ruoyi-generator/src/main/resources/vm/java/controller.java.vm

	ruoyi-generator/src/main/resources/vm/java/domain.java.vm

	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm

	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm

	ruoyi-ui/src/views/system/user/index.vue

	ruoyi-ui/src/views/tool/gen/editTable.vue

	ruoyi-ui/src/views/tool/gen/genInfoForm.vue

	ruoyi-ui/src/views/tool/gen/index.vue

	sql/ry_20210108.sql