Charles7c 51e1cd9307 Merge remote-tracking branch 'origin/2.0.x' into dev ... # Conflicts: # README.md # continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseReq.java # continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java # continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java # continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java # continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java # continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DeptReq.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/MenuReq.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/RoleReq.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java # continew-admin-ui/src/components/footer/index.vue # continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java # continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java # continew-admin-webapi/src/main/resources/config/application-dev.yml # continew-admin-webapi/src/main/resources/config/application-prod.yml # pom.xml		2023-11-04 23:57:06 +08:00
..
src/main	Merge remote-tracking branch 'origin/2.0.x' into dev	2023-11-04 23:57:06 +08:00
pom.xml	新增：个人中心新增查询操作日志功能，优化日志表结构，并支持关闭记录内网 IP 操作	2023-01-16 00:18:53 +08:00