luolm
|
13d6882c76
|
职位管理& 区域管理
|
2025-02-06 22:43:55 +08:00 |
|
luolm
|
66963b748f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-02-06 21:09:39 +08:00 |
|
luolm
|
cb22f0c434
|
职位管理
|
2025-02-06 21:08:22 +08:00 |
曹鹏飞
|
2c85fcff65
|
feat: 一些调整
|
2025-02-06 17:51:47 +08:00 |
|
大米
|
a7487dcafa
|
区域管理
|
2025-02-06 17:35:19 +08:00 |
|
大米
|
3f44dae2e6
|
区域管理
|
2025-02-06 17:12:11 +08:00 |
|
大米
|
36fe985f26
|
机型部件-优化
|
2025-02-06 14:48:45 +08:00 |
|
大米
|
54fd6efe04
|
机型部件
|
2025-02-06 14:40:20 +08:00 |
|
曹鹏飞
|
58a3d12fce
|
feat: 一些调整
|
2025-02-06 13:19:24 +08:00 |
|
大米
|
d22fe7edec
|
部门管理-删除
|
2025-02-06 11:01:30 +08:00 |
|
大米
|
5d5800eb1b
|
部门管理
|
2025-02-06 10:36:08 +08:00 |
|
曹鹏飞
|
efb81f7cc6
|
Merge remote-tracking branch '惠信/develop' into develop
|
2025-02-06 09:24:38 +08:00 |
|
luolm
|
1cde6c4ad2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-02-05 23:06:30 +08:00 |
|
luolm
|
e5a118c462
|
部门管理
|
2025-02-05 23:06:22 +08:00 |
|
曹鹏飞
|
5684456193
|
feat: 一些调整
|
2025-02-05 22:00:07 +08:00 |
|
曹鹏飞
|
148ff6dbb0
|
feat: 根据语言对应的时区返回时间
|
2025-02-05 18:19:51 +08:00 |
|
曹鹏飞
|
5f9543d097
|
perf: 添加功能
|
2025-02-05 17:24:07 +08:00 |
|
曹鹏飞
|
b3ec09148f
|
perf: 添加功能
|
2025-02-05 13:14:52 +08:00 |
|
luolm
|
0187c28a91
|
获取设备列表
|
2025-02-04 22:36:11 +08:00 |
|
luolm
|
efef85c89b
|
设备管理 ，部件管理
|
2025-02-04 22:09:54 +08:00 |
|
曹鹏飞
|
67b140318e
|
perf: 添加功能
|
2025-02-03 19:11:50 +08:00 |
|
曹鹏飞
|
808efac0bc
|
perf: 添加功能
|
2025-02-03 17:34:04 +08:00 |
|
曹鹏飞
|
00fc420f96
|
perf: 优化sse推送
|
2025-02-03 16:13:44 +08:00 |
|
曹鹏飞
|
233cd58630
|
feat: 添加工单提醒任务
|
2025-02-03 16:01:20 +08:00 |
|
曹鹏飞
|
e9e9762424
|
feat: 添加MethodInfoMark信息
|
2025-02-03 14:09:04 +08:00 |
|
曹鹏飞
|
4091e676d7
|
feat: 优化参数校验
|
2025-02-03 13:53:47 +08:00 |
|
曹鹏飞
|
6d00705773
|
feat: 添加功能
|
2025-02-01 22:57:03 +08:00 |
|
曹鹏飞
|
ce86696383
|
Merge remote-tracking branch '惠信/develop' into develop
|
2025-01-27 22:34:49 +08:00 |
|
曹鹏飞
|
7758098974
|
feat: 添加功能
|
2025-01-27 22:34:35 +08:00 |
|
luolm
|
7921dfbb2d
|
客户管理导入
|
2025-01-27 20:01:00 +08:00 |
|
luolm
|
5d5e02994e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-01-27 20:00:01 +08:00 |
|
luolm
|
2302448a9e
|
客户管理导入
|
2025-01-27 19:59:47 +08:00 |
|
曹鹏飞
|
4dc5382f9c
|
Merge remote-tracking branch '惠信/develop' into develop
# Conflicts:
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminRoleButtonMap.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminRoleMenuMap.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUserRoleMap.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseCustomer.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminRoleButtonMapMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminRoleMenuMapMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminUserRoleMapMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseCustomerMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminRoleButtonMapService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminRoleMenuMapService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminUserRoleMapService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseCustomerService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminRoleButtonMapServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminRoleMenuMapServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserRoleMapServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseCustomerServiceImpl.java
# nflg-mobilebroken-repository/src/main/resources/mapper/TBaseCustomerMapper.xml
|
2025-01-27 16:10:02 +08:00 |
|
曹鹏飞
|
3d84275a8c
|
feat: 添加功能
|
2025-01-27 16:08:17 +08:00 |
|
luolm
|
1c90c9f62d
|
客户管理
|
2025-01-27 16:05:53 +08:00 |
|
luolm
|
a8ba1912cc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-01-27 12:04:54 +08:00 |
|
luolm
|
31a8fd9cb2
|
设备管理
|
2025-01-27 12:04:39 +08:00 |
|
曹鹏飞
|
f58d39ff5e
|
fix: 修复一些问题
|
2025-01-26 22:40:03 +08:00 |
|
曹鹏飞
|
f4dace2cc3
|
Merge remote-tracking branch '惠信/develop' into develop
# Conflicts:
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/FileUploadRecord.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/TBasePosition.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/WebComponent.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/WebComponentTranslate.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/FileUploadRecordMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBasePositionMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/WebComponentMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/WebComponentTranslateMapper.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IFileUploadRecordService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBasePositionService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IWebComponentService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IWebComponentTranslateService.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/FileUploadRecordServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBasePositionServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentServiceImpl.java
# nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentTranslateServiceImpl.java
# nflg-mobilebroken-repository/src/main/resources/mapper/TBasePositionMapper.xml
|
2025-01-26 22:34:40 +08:00 |
|
曹鹏飞
|
8e1a59c743
|
feat: 添加功能
|
2025-01-26 22:27:16 +08:00 |
|
luolm
|
4998dcd2ee
|
日志管理
|
2025-01-26 20:08:56 +08:00 |
|
luolm
|
24c48ee42f
|
职位管理
|
2025-01-26 19:22:42 +08:00 |
|
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 |
|
luolm
|
f707ee9a89
|
职位管理
|
2025-01-26 16:54:47 +08:00 |
|
曹鹏飞
|
a55e35ab24
|
refactor: 移除不需要的表
|
2025-01-26 08:42:53 +08:00 |
|
曹鹏飞
|
47fa0d2bd7
|
refactor: 调整代码生成逻辑，避免无差异时的也生成提交代码
|
2025-01-26 08:41:18 +08:00 |
|
曹鹏飞
|
c5235858e4
|
忽略日志文件
|
2025-01-26 08:28:34 +08:00 |
|
曹鹏飞
|
42970e8611
|
Merge remote-tracking branch '惠信/develop' into develop
|
2025-01-26 08:26:52 +08:00 |
|
曹鹏飞
|
e76e3f20d8
|
perf: 排除日志文件
|
2025-01-26 08:20:14 +08:00 |
|
曹鹏飞
|
903bb6b56f
|
perf: 排除日志文件
|
2025-01-26 08:18:26 +08:00 |