Commit Graph

80 Commits

Author SHA1 Message Date
曹鹏飞 fc6434194c feat: 一些调整 2025-02-13 22:33:33 +08:00
曹鹏飞 1e30e82316 feat: 一些调整 2025-02-13 14:51:17 +08:00
曹鹏飞 7d43b5891f feat: 一些调整 2025-02-13 14:11:41 +08:00
曹鹏飞 7690c9128e feat: 一些调整 2025-02-12 20:30:31 +08:00
曹鹏飞 b8ddd0d8d6 feat: 一些调整 2025-02-12 15:39:20 +08:00
曹鹏飞 0fe44a2fbe feat: 一些调整 2025-02-12 13:02:48 +08:00
曹鹏飞 95dcd856e3 feat: 一些调整 2025-02-11 22:42:46 +08:00
曹鹏飞 1f7e2ca89d feat: 一些调整 2025-02-11 17:21:13 +08:00
曹鹏飞 cfc9b461da feat: 一些调整 2025-02-11 11:21:20 +08:00
曹鹏飞 14c4d7f2cd feat: 一些调整 2025-02-09 23:49:05 +08:00
luolm 1a27a98803 部门-调整 2025-02-09 18:06:13 +08:00
曹鹏飞 2916192e4e feat: 一些调整 2025-02-09 17:35:27 +08:00
曹鹏飞 51eefc8e9d feat: 一些调整 2025-02-09 17:10:44 +08:00
luolm f0b44ad060 部门-调整 2025-02-09 11:30:01 +08:00
luolm 4050c2b176 Merge remote-tracking branch 'origin/develop' into develop 2025-02-09 11:09:46 +08:00
luolm 92134db503 日志-调整 2025-02-09 11:09:36 +08:00
曹鹏飞 89b5ac2c4a Merge remote-tracking branch '惠信/develop' into develop 2025-02-09 07:45:01 +08:00
luolm dc3c75a62c 日志清除 2025-02-08 22:10:51 +08:00
曹鹏飞 816c07ca2f feat: 一些调整 2025-02-08 19:19:48 +08:00
曹鹏飞 59ffff943c feat: 一些调整 2025-02-08 19:00:06 +08:00
曹鹏飞 23b6a87999 feat: 一些调整 2025-02-08 18:26:09 +08:00
曹鹏飞 e2408d846f feat: 一些调整 2025-02-07 21:07:54 +08:00
曹鹏飞 d733933fe1 feat: 一些调整 2025-02-07 20:44:10 +08:00
曹鹏飞 37ed0275e4 feat: 一些调整 2025-02-07 20:09:52 +08:00
大米 c48a5c34be Merge remote-tracking branch 'origin/develop' into develop 2025-02-07 16:37:27 +08:00
大米 a636535dc0 客户管理加-负责人查询 2025-02-07 16:37:09 +08:00
曹鹏飞 a78e185378 feat: 一些调整 2025-02-07 10:58:29 +08:00
大米 8df67903e3 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBaseAreaService.java
2025-02-07 10:45:16 +08:00
大米 20b27b6e0c 区域管理-启用or 禁用 2025-02-07 10:43:36 +08:00
luolm 13d6882c76 职位管理& 区域管理 2025-02-06 22:43:55 +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
曹鹏飞 58a3d12fce feat: 一些调整 2025-02-06 13:19:24 +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 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
曹鹏飞 233cd58630 feat: 添加工单提醒任务 2025-02-03 16:01:20 +08:00
曹鹏飞 6d00705773 feat: 添加功能 2025-02-01 22:57:03 +08:00
曹鹏飞 7758098974 feat: 添加功能 2025-01-27 22:34:35 +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