Merge branch 'dev' of http://94.191.59.107:3000/wukai/lzga-doc into dev

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/service/impl/DocInfoServiceImpl.java

@@ -68,7 +68,9 @@ public class DocInfoServiceImpl implements IDocInfoService {
      */
     @Override
     public DocInfo selectDocInfoByDocInfo(DocInfo docInfo) {
-        return docInfoMapper.selectDocInfoByDocInfo(docInfo);
+        DocInfo doc = docInfoMapper.selectDocInfoByDocInfo(docInfo);
+        doc.setTagList(tagMapper.selectDocTagList4docId(doc.getDocId()));
+        return doc;
     }
 
     /**