Merge branch 'master' into dev_fix_mabitis

This commit is contained in:
thj
2021-10-20 20:56:09 +08:00
3 changed files with 4 additions and 2 deletions

View File

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

View File

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

View File

@@ -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 isAutoImport?exists && isAutoImport==true>import ${packageName}.entity.${classInfo.className};
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>