Merge remote-tracking branch 'origin/master'

cuilei

20 小时以前 76c5ad320495758d4e76d852d96914f1b405ece7

 src/main/java/org/jeecg/modules/cms/mapper/CuttingReceiveDetailMapper.java

@@ -15,5 +15,5 @@
 */
public interface CuttingReceiveDetailMapper extends BaseMapper<CuttingReceiveDetail> {

    public List<Map<String, Object>> detailList(@Param("orderId") String orderId);
    List<Map<String, Object>> detailList(@Param("orderId") String orderId);
}