Merge remote-tracking branch 'origin/master'

cuilei

4 天以前 3c45b1467ddfb5a55b8bca17e50f8469811782e9

 src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml

@@ -8,6 +8,7 @@
            t1.work_order_code AS text,
            t1.id AS value,
            t2.factory_code factoryCode,
            t2.production_type productionType,
            t3.shift_code shiftCode
        FROM mes_production_work_order t1
        LEFT JOIN base_factory t2 ON t1.factory_id = t2.id