Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

cloud-model/src/main/resources/mapper/ProjectMapper.xml

@@ -72,7 +72,7 @@
         select
         p.id id,p.project_name project_name, p.creator creator,tbc.id owner_company,
         tbc.company_name owner_company_name,p.manager_id manager_id,p.manager manager,
-        p.indate indate
+        p.indate indate,p.is_delete
         from
         tb_project p
         left join tb_project_user pu