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

rk

4 天以前 28d2b0a2b33c786670f4999e4b634036de2d6883

 server/system_service/src/main/java/com/doumee/dao/system/model/SystemUserRole.java

@@ -1,6 +1,6 @@
package com.doumee.dao.system.model;

import com.doumee.core.model.LoginUserModel;
import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;