Merge remote-tracking branch 'origin/master'

cuilei

18 小时以前 76c5ad320495758d4e76d852d96914f1b405ece7

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

@@ -32,7 +32,7 @@
                     t2.warehouse_id,
                     t2.batch_number,
                     t2.steel_ball_size,
                     t2.quantity,
                     t1.quantity,
                     t2.remaining_quantity,
                     t2.unloading_flag,
                     'UNLOADING' AS category