Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes

xuhy

2024-12-30 6ae4074360580e31b4b4bb9e9a3c56aa853b0269

 manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java

@@ -86,7 +86,12 @@
            TAppUser byId4 = appUserService.getById(byId1);
            if (byId4!=null){
                res.setPhone(byId4.getPhone());
                res.setName(byId4.getName());
                res.setRealName(byId4.getRealName());
            }
        }else{
            res.setPhone(byId1.getPhone());
            res.setRealName(byId1.getRealName());
        }
        res.setStoreName(byId2.getName());
        res.setOptometristName(byId5.getName());