Merge branch 'master' of huangrui/CostAccount into dev

src/main/resources/mapper/CostCostingGroupMapper.xml

@@ -107,6 +107,8 @@
         <if test="accountCode != null and accountCode != ''">
             and ccg.account_code = #{accountCode}
         </if>
+        and cp.delete_time = 0
+        and ccg.delete_time = 0
         and cr.delete_time = 0
         and ca.delete_time = 0
     </select>