Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysSuggestion.java

@@ -27,6 +27,9 @@ public class SysSuggestion {
 	@ApiModelProperty(value = "用户编号",required = false)
 	private Long userId;
 	
+	@ApiModelProperty(value = "客户端类型",required = false)
+	private String clientType;
+	
 	/** 提交时间 */
 	private java.util.Date createTime;
 	
@@ -70,6 +73,14 @@ public class SysSuggestion {
 		return this.userId;
 	}
 			
+	public String getClientType() {
+		return clientType;
+	}
+
+	public void setClientType(String clientType) {
+		this.clientType = clientType;
+	}
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -67,8 +67,9 @@ public class StudentManageController extends BaseController {
 
     @ApiOperation(value = "新增建议")
     @PostMapping("suggestion/add")
-    public Object add(SysSuggestion SysSuggestion) {
-        suggestionService.insert(SysSuggestion);
+    public Object add(SysSuggestion sysSuggestion) {
+    	sysSuggestion.setClientType("STUDENT");
+        suggestionService.insert(sysSuggestion);
         return succeed();
     }
 

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherManageController.java

@@ -1,18 +1,9 @@
 package com.ym.mec.teacher.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dto.CashAccountDetail;
-import com.ym.mec.biz.dal.entity.SysSuggestion;
-import com.ym.mec.biz.dal.entity.SysUserBankCard;
-import com.ym.mec.biz.dal.entity.VipGroup;
-import com.ym.mec.biz.service.*;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.entity.UploadReturnBean;
-import com.ym.mec.util.upload.UploadUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,6 +14,22 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.CashAccountDetail;
+import com.ym.mec.biz.dal.entity.SysSuggestion;
+import com.ym.mec.biz.dal.entity.SysUserBankCard;
+import com.ym.mec.biz.service.ClassGroupService;
+import com.ym.mec.biz.service.StudentRegistrationService;
+import com.ym.mec.biz.service.SysSuggestionService;
+import com.ym.mec.biz.service.SysUserBankCardService;
+import com.ym.mec.biz.service.SysUserCashAccountDetailService;
+import com.ym.mec.biz.service.SysUserCashAccountService;
+import com.ym.mec.biz.service.UploadFileService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.UploadReturnBean;
+import com.ym.mec.util.upload.UploadUtil;
+
 @Api(tags = "教师管理")
 @RestController
 public class TeacherManageController extends BaseController {
@@ -65,8 +72,9 @@ public class TeacherManageController extends BaseController {
 
     @ApiOperation(value = "新增建议")
     @PostMapping("suggestion/add")
-    public Object add(SysSuggestion SysSuggestion) {
-        suggestionService.insert(SysSuggestion);
+    public Object add(SysSuggestion sysSuggestion) {
+    	sysSuggestion.setClientType("TEACHER");
+        suggestionService.insert(sysSuggestion);
         return succeed();
     }