Merge remote-tracking branch 'origin/master'

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

@@ -44,7 +44,7 @@ public class ClassGroup {
 	@ApiModelProperty(value = "群名称", required = true)
 	private String groupName;
 
-	/** 群名称 */
+	/** 乐团名称 */
 	@ApiModelProperty(value = "乐团名称", required = true)
 	private String musicGroupName;
 

mec-biz/src/main/resources/config/mybatis/ImGroupNoticeMapper.xml

@@ -50,13 +50,13 @@
                 title_ = #{title},
             </if>
             <if test="content != null">
-                content_ = content,
+                content_ = #{content},
             </if>
             <if test="isTop != null">
                 is_top_ = #{isTop},
             </if>
             <if test="updateTime != null">
-                update_time_ = NOW()
+                update_time_ = NOW(),
             </if>
             <if test="operatorId != null">
                 operator_id_ = #{operatorId}

mec-web/src/main/java/com/ym/mec/web/controller/SysTenantAccountController.java

@@ -38,7 +38,7 @@ public class SysTenantAccountController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('sysTenantAccount/get')")
     public Object get(Integer teacherId) {
         if (teacherId == null || teacherId <=0) {
-            return failed(HttpStatus.FORBIDDEN, "用户id必须大于0");
+            return failed("用户id必须大于0");
         }
 
         return succeed(sysTenantAccountService.get(teacherId));