Go to file
luolm aafbe10238 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	logs/mobilebroken-admin.log
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminMenu.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminMessage.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminRole.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppArea.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppMessage.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUserApplyfor.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Company.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DeviceComponent.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Dictionary.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItem.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItemTranslate.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Language.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ParamConfig.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDepartment.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDeviceType.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseRequestLog.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseRequestLogDetail.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Ticket.java
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketFollow.java
2025-01-26 17:01:41 +08:00
logs Merge remote-tracking branch 'origin/develop' into develop 2025-01-26 17:01:41 +08:00
nflg-mobilebroken-admin 职位管理 2025-01-26 16:54:47 +08:00
nflg-mobilebroken-auth feat: 添加功能 2025-01-25 23:11:05 +08:00
nflg-mobilebroken-cfs-app feat: 添加功能 2025-01-25 23:11:05 +08:00
nflg-mobilebroken-common Merge remote-tracking branch 'origin/develop' into develop 2025-01-25 23:32:45 +08:00
nflg-mobilebroken-gateway feat: 添加功能 2025-01-25 23:11:05 +08:00
nflg-mobilebroken-repository Merge remote-tracking branch 'origin/develop' into develop 2025-01-26 17:01:41 +08:00
nflg-mobilebroken-starter Merge remote-tracking branch 'origin/develop' into develop 2025-01-25 23:32:45 +08:00
.gitignore 忽略日志文件 2025-01-26 08:28:34 +08:00
pom.xml feat: 添加功能 2025-01-25 23:11:05 +08:00