Merge remote-tracking branch 'origin/dev' into dev

2026-02-26 09:37:03 +08:00
parent 9621deccf1 71353cd299
commit 90b701c1f3
1 changed files with 8 additions and 1 deletions
@@ -77,7 +77,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <select id="selectServiceTypes" parameterType="com.mhd.basic.domain.serviceItemsManage.repository.todo.ServiceItemsManageDO"
            resultType="com.mhd.basic.domain.serviceItemsManage.repository.po.ServiceItemsManagePO">
-        select  organization_name,service_items_code,service_items_name,tax_rate,CONCAT(service_items_name,service_items_code) cost_type
+        select
+            top_organization_id,
+            organization_id,
+            organization_name,
+            service_items_code,
+            service_items_name,
+            tax_rate,
+            CONCAT(service_items_name, service_items_code) cost_type
        from service_items_manage
        <include refid="selectServiceItemsManagePo1"/>
    </select>