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

doum

7 天以前 a291dd70f178d32f8b582a9c6ed1a73b5a81a62e

 server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java

@@ -5,9 +5,9 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.CreateSystemUserDTO;
import com.doumee.dao.system.dto.CreateUserRoleDTO;