mybatis.dbType=mysql to  jdbc.type=mysql
front menu active fix
自增ID改为UUID
Merge remote-tracking branch 'remotes/origin/jeesite_plus'
Merge branch 'master' of https://github.com/thinkgem/jeesite

Conflicts:
	README.md
Merge remote-tracking branch 'remotes/origin/jeesite_plus'

Conflicts:
	db/prj/jeesite_mssql.sql
	db/prj/jeesite_mysql.sql
	db/prj/jeesite_oracle.sql
	src/main/java/com/thinkgem/jeesite/modules/prj/entity/Project.java
	src/main/java/com/thinkgem/jeesite/modules/prj/utils/SourceColumn.java
	src/main/java/com/thinkgem/jeesite/modules/prj/utils/SourceRelation.java
	src/main/java/com/thinkgem/jeesite/modules/prj/utils/SourceTable.java
	src/main/java/com/thinkgem/jeesite/modules/prj/utils/SourceUtils.java
	src/main/resources/templates/entityAndDao/dao.ftl
	src/main/resources/templates/entityAndDao/entity.ftl
	src/main/resources/templates/single/normal/controller.ftl
	src/main/resources/templates/single/normal/service.ftl
	src/main/resources/templates/single/normal/viewForm.ftl
	src/main/resources/templates/single/normal/viewList.ftl
	src/main/webapp/WEB-INF/views/modules/cms/cmsTree.jsp
	src/main/webapp/static/echarts/index.html
	src/main/webapp/static/echarts/js/echarts-map.js
	src/main/webapp/static/echarts/js/echarts-original-map.js
	src/main/webapp/static/echarts/js/echarts-original.js
	src/main/webapp/static/echarts/js/esl.js
	src/main/webapp/static/x-editable/css/bootstrap-editable.css
	src/main/webapp/static/x-editable/js/bootstrap-editable.js
数据模型索引修正；
增加对文件管理上传目录的配置，可以自定义为服务器上的任一位置，可以是绝对路径或相对路径；
fix long cannot be cast to string error.
Merge branch 'jessite-master'
Merge branch 'jeesite-master'

Conflicts:
	README.md
	bin/refresh-db/activiti5.12.1/database/upgrade/activiti.db2.upgradestep.58.to.59.engine.sql
	bin/refresh-db/activiti5.12.1/database/upgrade/activiti.h2.upgradestep.58.to.59.engine.sql
	bin/refresh-db/activiti5.12.1/database/upgrade/activiti.mssql.upgradestep.58.to.59.engine.sql
	bin/refresh-db/activiti5.12.1/database/upgrade/activiti.mysql.upgradestep.58.to.59.engine.sql
	bin/refresh-db/activiti5.12.1/database/upgrade/activiti.oracle.upgradestep.58.to.59.engine.sql
	bin/refresh-db/activiti5.12.1/database/upgrade/activiti.postgres.upgradestep.58.to.59.engine.sql
	pom.xml
	src/main/java/com/thinkgem/jeesite/common/persistence/BaseDao.java
	src/main/java/com/thinkgem/jeesite/common/persistence/Page.java
	src/main/java/com/thinkgem/jeesite/common/persistence/annotation/MyBatisDao.java
	src/main/java/com/thinkgem/jeesite/common/persistence/dialect/Dialect.java
	src/main/java/com/thinkgem/jeesite/common/persistence/dialect/db/DB2Dialect.java
	src/main/java/com/thinkgem/jeesite/common/persistence/dialect/db/DerbyDialect.java
	src/main/java/com/thinkgem/jeesite/common/persistence/dialect/db/H2Dialect.java
	src/main/java/com/thinkgem/jeesite/common/persistence/dialect/db/HSQLDialect.java
	src/main/java/com/thinkgem/jeesite/common/persistence/dialect/db/MySQLDialect.java
	src/main/java/com/thinkgem/jeesite/common/persistence/dialect/db/OracleDialect.java
	src/main/java/com/thinkgem/jeesite/common/persistence/dialect/db/PostgreSQLDialect.java
	src/main/java/com/thinkgem/jeesite/common/persistence/dialect/db/SQLServerDialect.java
	src/main/java/com/thinkgem/jeesite/common/persistence/dialect/db/SybaseDialect.java
	src/main/java/com/thinkgem/jeesite/common/persistence/interceptor/BaseInterceptor.java
	src/main/java/com/thinkgem/jeesite/common/persistence/interceptor/PaginationInterceptor.java
	src/main/java/com/thinkgem/jeesite/common/persistence/interceptor/PreparePaginationInterceptor.java
	src/main/java/com/thinkgem/jeesite/common/persistence/interceptor/SQLHelper.java
	src/main/java/com/thinkgem/jeesite/common/persistence/proxy/PageConfiguration.java
	src/main/java/com/thinkgem/jeesite/common/persistence/proxy/PaginationMapperMethod.java
	src/main/java/com/thinkgem/jeesite/common/servlet/CKFinderFilesServlet.java
	src/main/java/com/thinkgem/jeesite/common/web/SecureModelAttribute.java
	src/main/java/com/thinkgem/jeesite/common/web/SecureModelAttributeMethodArgumentResolver.java
	src/main/java/com/thinkgem/jeesite/common/workflow/WorkflowEntity.java
	src/main/java/com/thinkgem/jeesite/generate/template/service.ftl
	src/main/java/com/thinkgem/jeesite/modules/cms/service/ArticleService.java
	src/main/java/com/thinkgem/jeesite/modules/cms/web/front/FrontController.java
	src/main/java/com/thinkgem/jeesite/modules/sys/entity/Menu.java
	src/main/java/com/thinkgem/jeesite/modules/sys/entity/Role.java
	src/main/java/com/thinkgem/jeesite/modules/sys/entity/User.java
	src/main/java/com/thinkgem/jeesite/modules/sys/web/RoleController.java
	src/main/java/com/thinkgem/jeesite/modules/sys/web/WorkflowController.java
	src/main/resources/jeesite.properties
	src/main/resources/mappings/mysql/sys/MyBatisDictDao.xml
	src/main/resources/mybatis-config.xml
	src/main/webapp/WEB-INF/tags/treeselect.tag
	src/main/webapp/WEB-INF/views/mobile/sys/sysLogin.jsp
	src/main/webapp/WEB-INF/views/modules/cms/cmsTree.jsp
	src/main/webapp/WEB-INF/views/modules/oa/leaveDetail.jsp
	src/main/webapp/WEB-INF/views/modules/oa/leaveList.jsp
	src/main/webapp/WEB-INF/views/modules/oa/leaveTask.jsp
	src/main/webapp/WEB-INF/views/modules/sys/roleAssign.jsp
	src/main/webapp/WEB-INF/views/modules/sys/selectUserToRole.jsp
	src/main/webapp/static/common/backstretch.min.js
	src/main/webapp/static/common/typica-login.css