-
Merge pull request !407 from xingyu/1.X-dev
-
Merge pull request !406 from AKING/N/A
-
解决tagViews左右两侧按钮不能垂直居中的问题，直接使用flex，简简单单 Signed-off-by: AKING <2734339436@qq.com>
-
Merge pull request !403 from 芋道源码/feature/dev-yunai
-
# Conflicts: # yudao-ui-admin-vue3/pnpm-lock.yaml
-
Merge pull request !401 from xingyu/1.X-dev
-
# Conflicts: # yudao-ui-admin-vue3/package.json # yudao-ui-admin-vue3/pnpm-lock.yaml # yudao-ui-admin-vue3/src/main.ts
-
Merge pull request !399 from 麦克学IT/master
-
javax.validation.ConstraintViolationException: createOperateLog.arg0.name: 操作名
-
Merge pull request !397 from 芋道源码/feature/vue3-bpm
-
# Conflicts: # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
-
Merge pull request !396 from 芋道源码/feature/dev-yunai
-
Merge pull request !395 from 沧海/N/A
-
Signed-off-by: 沧海 <gentoo111@163.com>
-
Merge pull request !380 from xingyu/feature/springdoc
-
# Conflicts: # yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java # yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql # yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java # yudao-server/pom.xml
-
Merge pull request !369 from zhang.xionghui/master
-
Merge pull request !345 from niu_dehua/master_unit-sql
-
# Conflicts: # yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
