Merge remote-tracking branch 'origin/master'

无关风月

5 天以前 72faad1ea54670b640c172e3f7efe49f698cf420

 manage/src/main/java/com/jilongda/manage/service/impl/TOrderServiceImpl.java

@@ -62,8 +62,8 @@
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        for (TOrder tOrder : list) {
            TOrderListVO tOrderListVO = new TOrderListVO();
            if (tOrder.getUserId()!=null){
                TAppUser tAppUser = appUserMapper.selectById(tOrder.getUserId());
            TAppUser tAppUser = appUserMapper.selectById(tOrder.getUserId());
            if (tAppUser!=null){
                tOrderListVO.setWxName(tAppUser.getName());
            }
            TStore tStore = storeMapper.selectById(tOrder.getStoreId());