Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
commit
0c20b4064e
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue