Merge branch 'master' into dev_fix_mabitis

Author: Thixiaoxiao

generator-web/src/main/resources/statics/js/main.js

@@ -166,7 +166,7 @@ function setAllCookie() {
 }
 
 function setOneCookie(key) {
-	setCookie(key, vm.formData.options[key]);
+	setCookie(key, vm.formData.options[key], 60 * 60 * 24 * 7);
 }
 
 /**

generator-web/src/main/resources/templates/code-generator/jpa/jpacontroller.ftl

@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+
 </#if>
 /**
  * @description ${classInfo.classComment}

generator-web/src/main/resources/templates/code-generator/jpa/repository.ftl

@@ -1,4 +1,4 @@
-<#if isWithPackage?exists && isWithPackage==true>package ${packageName}.mapper;</#if>
+<#if isWithPackage?exists && isWithPackage==true>package ${packageName}.repository;</#if>
 <#if isAutoImport?exists && isAutoImport==true>import ${packageName}.entity.${classInfo.className};
 
 <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>