Merge remote-tracking branch 'origin/dev0310' into dev0310

dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java

@@ -89,5 +89,21 @@ public class EmailMaintainController extends AbstractController  {
         return ResponseEntity.ok(R.error());
     }
 
+
+    /**
+     * 编辑数据
+     *
+     * @param emailMaintain 实体
+     * @return 编辑结果
+     */
+    @PostMapping("/emailUpload")
+    public ResponseEntity<R> emailUpload(@RequestBody  EmailMaintainVo emailMaintain) {
+        boolean b = emailMaintainService.update(emailMaintain);
+        if(b){
+            return ResponseEntity.ok(R.ok());
+        }
+        return ResponseEntity.ok(R.error());
+    }
+
 }