Merge branch 'leng_dev' into dev

pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm

@@ -38,6 +38,6 @@ private $column.attrType $column.lowerAttrName;
    */
   @Override
   protected Serializable pkVal() {
-    return this.$pk.columnName;
+    return this.$pk.lowerAttrName;
   }
 }

pigx-visual/pigx-codegen/src/main/resources/template/Mapper.xml.vm

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="${package}.${moduleName}.dao.${className}Mappper">
+<mapper namespace="${package}.${moduleName}.mapper.${className}Mappper">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="${package}.${moduleName}.entity.${className}" id="${classname}Map">

pom.xml

@@ -37,7 +37,7 @@
 	</parent>
 
 	<properties>
-		<pigx.version>1.4.1</pigx.version>
+		<pigx.version>1.4.2</pigx.version>
 		<spring-boot.version>2.0.3.RELEASE</spring-boot.version>
 		<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>