Merge remote-tracking branch 'origin/master'

edu-im/edu-im-api/src/main/java/com/keao/edu/im/api/entity/ImUserModel.java

@@ -19,7 +19,7 @@ public class ImUserModel {
         this.id = id;
         this.name = name;
         if(StringUtils.isEmpty(portrait)){
-            this.portrait = "https://daya-online.oss-cn-beijing.aliyuncs.com/201912/RkoZBNq.jpeg";
+            this.portrait = "https://daya-online.oss-cn-beijing.aliyuncs.com/202007/S4bb4ZQ.png";
         }else {
             this.portrait = portrait;
         }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/SubjectController.java

@@ -34,6 +34,16 @@ public class SubjectController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "删除科目")
+    @PostMapping("/del")
+    @PreAuthorize("@pcs.hasPermissions('subject/del')")
+    public HttpResponseResult del(@RequestBody Subject subject){
+        subject.setTenantId(TenantContextHolder.getTenantId());
+        subject.setDelFlag(true);
+        subjectService.upSetSubject(subject);
+        return succeed();
+    }
+
     @ApiOperation(value = "根据科目编号查询科目")
     @GetMapping("/get/{id}")
     @PreAuthorize("@pcs.hasPermissions('subject/get')")