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

doum

2025-11-26 5e6da22fb6f3b65e4dbf83896ad2a05d6d971432

 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;