Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-06-11 a51f7d52ed93f62f5f5eeb445163ab48a523dbe2

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

@@ -29,7 +29,7 @@
   private ${pkColumn.javaType} ${pkColumn.javaField};

#foreach ($column in $columns)
#if($column.isList)
#if($column.isList && $column.isPk!=1)
   /** $column.columnComment */
#set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1)