Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-11 3594a911312b92561b08c478ef0319cf1ae2b0d8

 inventory-server/src/main/resources/mapper/ImportRepertoryMapper.xml

@@ -4,13 +4,13 @@
    <select id="selectAllImpRep" resultType="java.util.Map">
        select id,
        order_code,
        code,
        quality_traceability,
        name,
        specifications,
        unit,
        number,
        user_name,
        create_time
        DATE_FORMAT(create_time, '%Y-%m-%d')'入库日期'
        from mom_ocean.import_repertory
        where state=1
        <if test="orderCode!=null and orderCode!=''">