rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/bug-1286' into develop

This commit is contained in:
曹鹏飞 2026-02-03 10:25:00 +08:00
parent 422489018c 6bac73d8b7
commit b2d1065233
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java
View File

@ -649,8 +649,8 @@ public class DeviceController extends ControllerBase {
} else if (customer.getEnableState() == 0) { } else if (customer.getEnableState() == 0) {
sb.append("服务代理商状态为禁用;"); sb.append("服务代理商状态为禁用;");
} else { } else {
device.setServiceAgentCode(customer.getAgencyCompanyName()); device.setServiceAgentCode(customer.getAgencyCompanyCode());
device.setServiceAgentName(customer.getAgencyCompanyCode()); device.setServiceAgentName(customer.getAgencyCompanyName());
} }
}else { }else {
device.setServiceAgentCode(""); device.setServiceAgentCode("");

4
nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java
View File

@ -672,8 +672,8 @@ public class DeviceController extends ControllerBase {
} else if (customer.getEnableState() == 0) { } else if (customer.getEnableState() == 0) {
sb.append("服务代理商状态为禁用;"); sb.append("服务代理商状态为禁用;");
} else { } else {
device.setServiceAgentCode(customer.getAgencyCompanyName()); device.setServiceAgentCode(customer.getAgencyCompanyCode());
device.setServiceAgentName(customer.getAgencyCompanyCode()); device.setServiceAgentName(customer.getAgencyCompanyName());
} }
}else { }else {
device.setServiceAgentCode(""); device.setServiceAgentCode("");