diff --git a/server/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java b/server/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java index 0be18f9a..1ccb2f4e 100644 --- a/server/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java +++ b/server/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java @@ -27,7 +27,7 @@ public class GlobalConfig { public static String publicPrefix = "uploads"; // 上传映射目录 - public static String uploadDirectory = "/www/wwwroot/uploads/"; + public static String uploadDirectory = "/www/like-admin/uploads/"; // 上传图片限制 public static Integer uploadImageSize = 1024 * 1024 * 10; diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index 0d0ca85a..d083837c 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -104,7 +104,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #foreach ($column in $columns) #if($column.isQuery) #if($dateFields.contains($column.columnName)) - "datetime:startTime-endTime@${column.columnName}:str" + "datetime:${column.javaField}Start-${column.javaField}End@${column.columnName}:str" #elseif($column.javaType=="Integer") #if($column.javaField.equals($column.columnName)) "${column.queryType.toLowerCase()}:${column.javaField}:int",