Merge remote-tracking branch 'origin/master'

liujie

2023-05-26 89ea5267bd4b4f5540b5eb3961c7c8ef3859a225

 src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TClaimMapper.xml

@@ -50,7 +50,7 @@
   t1.describe,
   t1.remark,
   t1.number,
   t1.price,t1.order_id orderId
   t1.price,t1.order_id orderId,t1.status
FROM
   t_claim t1 LEFT JOIN t_company t2 on t1.trucking_company_id = t2.id where t1.id =#{id}
    </select>