mirror of
https://github.com/jeecgboot/JeecgBoot.git
synced 2025-12-31 20:28:14 +00:00
cdea05ebb0
# Conflicts: # jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java # jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java # jeecg-module-system/jeecg-system-biz/pom.xml # jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java # jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/WechatVerifyController.java # jeecg-module-system/jeecg-system-start/pom.xml # jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml # pom.xml