Merge remote-tracking branch 'origin/master'

cuilei

昨天 f95d05316d49bcdd31d022a11d0fc4fbafb040da

 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);
}