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

doum

5 小时以前 145dbc2a4f5bafcb432fb35d7bc91101aa3318d8

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

@@ -4,9 +4,9 @@
import com.doumee.biz.system.SystemPermissionBiz;
import com.doumee.core.annotation.pr.PreventRepeat;
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.QuerySystemPermissionDTO;
import com.doumee.dao.system.model.SystemPermission;