Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ContractTemplateController.java

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserDeviceServiceImpl.java

@@ -97,7 +97,7 @@ public class SysUserDeviceServiceImpl extends BaseServiceImpl<Long, SysUserDevic
 		
 		SysUserDevice sysUserDevice = sysUserDeviceDao.get(id);
 		if(sysUserDevice != null){
-			sysUserDevice.setDelFlag(false);
+			sysUserDevice.setDelFlag(true);
 			
 			sysUserDeviceDao.update(sysUserDevice);
 		}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ContractTemplateController.java

@@ -1,13 +1,15 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.alibaba.cloud.commons.lang.StringUtils;
 import com.yonge.cooleshow.common.enums.ContractTemplateSourceEnum;
 import com.yonge.cooleshow.common.enums.ContractTemplateTypeEnum;
 import com.yonge.toolset.base.util.StringUtil;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-
 import io.swagger.annotations.ApiParam;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -81,8 +83,12 @@ public class ContractTemplateController extends BaseController {
 	@ApiOperation("更新")
 	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@PreAuthorize("@pcs.hasPermissions('contractTemplate/update')")
-	public HttpResponseResult<Object> update(@RequestBody ContractTemplate tenantContractTemplate) {
-		contractTemplateService.update(tenantContractTemplate);
+	public HttpResponseResult<Object> update(@RequestBody ContractTemplate contractTemplate) {
+
+        if(StringUtils.isBlank(contractTemplate.getType())){
+        	contractTemplate.setType("BUY_ORDER");
+        }
+		contractTemplateService.update(contractTemplate);
 		return succeed();
 	}