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

功能完善
2024-01-24 11:30:37 +08:00 · 2024-01-24 11:29:30 +08:00
1 changed files with 1 additions and 1 deletions
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
@ -267,7 +267,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <select id="selectPutInListList" resultMap="PurchasePartInfoResult">
        SELECT
-            pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, us.user_name as createBy, pci.create_time,
+            pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, us.user_name as create_by, pci.create_time,
            pci.update_by,
            pci.update_time, pci.remark, pci.company_id ,tk.code,tk.task_status taskStatus,GROUP_CONCAT(distinct mpt1.pa_name) purchasingTypeName,
            CASE
Author	SHA1	Message	Date
bns_han	367ad3f33e	Merge remote-tracking branch 'origin/test' into dev	2024-01-24 11:30:37 +08:00
bns_han	382bc7b6f3	功能完善	2024-01-24 11:29:30 +08:00