Merge remote-tracking branch 'origin/lei_dev' into leng_dev

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

@@ -52,6 +52,9 @@ public class ${className} extends Model<${className}> {
      */
 #if($column.columnName == $pk.columnName)
     @TableId(type = IdType.ASSIGN_ID)
+#end
+#if($column.columnName == 'del_flag')
+    @TableLogic
 #end
     @ApiModelProperty(value="$column.comments"#if($column.hidden),hidden=$column.hidden#end)
     private $column.attrType $column.lowerAttrName;